diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2005-06-02 20:41:04 +0000 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-06-02 20:41:04 +0000 |
commit | 359c0a71713e606f440d40f55a43c77349df2aaa (patch) | |
tree | 39a017967dc54dc07af18154a75cb037672d9ac2 /modules | |
parent | 2ccc3542393d799c3b9ca966101e9efe58df0495 (diff) | |
download | gnulib-359c0a71713e606f440d40f55a43c77349df2aaa.tar.gz |
Sync from coreutils.
Use "file name" when talking about file names, instead of "filename"
or "path", as per the GNU coding standards.
* MODULES.html.sh: mkdir-p renamed from makepath.
filenamecat renamed from path-concat.
* modules/filenamecat: Renamed from modules/path-concat.
(Files): filenamecat.h and filenamecat.c renamed from
path-concat.h and path-concat.c.
(configure.ac): gl_FILE_NAME_CONCAT, not gl_PATH_CONCAT.
(Include): filenamecat.h, not path-concat.h.
* modules/mkdir-p: Renamed from modules/makepath.
(Files): mkdir-p.h and mkdir-p.c renamed from makepath.h and makepath.c.
(configure.ac): gl_MKDIR_PARENTS, not gl_MAKEPATH.
(Include): mkdir-p.h, not makepath.h.
* lib/mkdir-p.c: Renamed from makepath.c.
(make_dir_parents): Renamed from make_path. All callers changed.
* lib/mkdir-p.h: Likewise. All includers changed.
* lib/filenamecat.c: Renamed from path-concat.c.
(file_name_concat): Renamed from path_concat. All callers changed.
[TEST_FILE_NAME_CONCAT]: Renamed from TEST_PATH_CONCAT.
* lib/filenamecat.h: Likewise. All includers changed.
* lib/acl.c: Don't use "path" or "filename" to mean "file name"
in comments or local variable names.
* lib/basename.c: Likewise.
* lib/canonicalize.c, canonicalize.h: Likewise.
* lib/dirname.c, dirname.h: Likewise.
* lib/euidaccess.c: Likewise.
* lib/exclude.c: Likewise
* lib/fnmatch_.h, fnmatch_loop.c: Likewise.
* lib/fsusage.c, fsuage.h: Likewise.
* lib/fts.c, fts_.h: Likewise.
* lib/getcwd.c: Likewise.
* lib/getloadavg.c: Likewise.
* lib/mkstemp.c: Likewise.
* lib/mountlist.c, mountlist.h: Likewise.
* lib/openat.c, openat.h: Likewise.
* lib/readlink-stub.c: Likewise.
* lib/readutmp.c, readutmp.h: Likewise.
* lib/rename.c: Likewise.
* lib/rmdir.c: Likewise.
* lib/same.c: Likewise.
* lib/savedir.c: Likewise.
* lib/stripslash.c: Likewise.
* lib/tempname.c: Likewise.
* lib/xreadlink.c: Likewise.
* lib/exclude.c (excluded_file_name): Renamed from excluded_filename.
All uses changed.
* lib/exclude.h: Likewise.
* m4/mkdir-p.m4: Renamed from makepath.m4.
(gl_MKDIR_PARENTS): Renamed from gl_MAKEPATH. All uses changed.
Rename files from makepath.c to mkdir-p.c, and from
makepath.h to mkdir-p.h.
* m4/filenamecat.m4: Renamed from path-concat.m4.
(gl_FILE_NAME_CONCAT): Renamed from gl_PATH_CONCAT. All uses changed.
Rename files from path-concat.c to filenamecat.c,
and from path-concat.h to filenamecat.h.
* m4/getcwd-path-max.m4: Don't use "path" or "filename" to mean
"file name" in local variables or comments.
* rename.m4: Likewise.
* lib/euidaccess.c (getuid, getgid, getuid, getegid)
[!defined _POSIX_VERSION]: Remove decls; not needed these days.
* lib/idcache.c (getpwuid, getpwnam, getgrgid, getgrnam)
[!defined _POSIX_VERSION]: Remove decls; not needed these days.
* lib/pathmax.h: Include <limits.h> unconditionally, since other
files have been getting away with it for years (MORE/BSD 4.3
is extinct now).
* lib/userspec.c (getpwnam, getgrnam, getgrgid)
[!defined _POSIX_VERSION]: Remove decls; not needed these days.
* lib/pathmax.h (_POSIX_PATH_MAX) [!defined _POSIX_PATH_MAX]:
Define to 256, not 255, as per modern POSIX.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/canonicalize | 2 | ||||
-rw-r--r-- | modules/filenamecat | 26 | ||||
-rw-r--r-- | modules/mkdir-p (renamed from modules/makepath) | 12 | ||||
-rw-r--r-- | modules/path-concat | 27 |
4 files changed, 33 insertions, 34 deletions
diff --git a/modules/canonicalize b/modules/canonicalize index 42b50fcafe..be574faa37 100644 --- a/modules/canonicalize +++ b/modules/canonicalize @@ -8,7 +8,7 @@ m4/canonicalize.m4 Depends-on: cycle-check -path-concat +filenamecat stat-macros xalloc xgetcwd diff --git a/modules/filenamecat b/modules/filenamecat new file mode 100644 index 0000000000..fb1786b843 --- /dev/null +++ b/modules/filenamecat @@ -0,0 +1,26 @@ +Description: +Concatenate two arbitrary file names. + +Files: +lib/filenamecat.h +lib/filenamecat.c +m4/dos.m4 +m4/filenamecat.m4 + +Depends-on: +xalloc +dirname + +configure.ac: +gl_FILE_NAME_CONCAT + +Makefile.am: + +Include: +"filenamecat.h" + +License: +GPL + +Maintainer: +Jim Meyering diff --git a/modules/makepath b/modules/mkdir-p index 5dc5bf79e8..b3f787bdad 100644 --- a/modules/makepath +++ b/modules/mkdir-p @@ -1,11 +1,11 @@ Description: -Ensure that a directory path exists. +Ensure that a directory and its parents exist. Files: -lib/makepath.h -lib/makepath.c +lib/mkdir-p.h +lib/mkdir-p.c m4/afs.m4 -m4/makepath.m4 +m4/mkdir-p.m4 Depends-on: alloca @@ -19,12 +19,12 @@ stat-macros stdbool configure.ac: -gl_MAKEPATH +gl_MKDIR_PARENTS Makefile.am: Include: -"makepath.h" +"mkdir-p.h" License: GPL diff --git a/modules/path-concat b/modules/path-concat deleted file mode 100644 index e108c55af8..0000000000 --- a/modules/path-concat +++ /dev/null @@ -1,27 +0,0 @@ -Description: -Construct a full pathname by concatenating a directory name and a relative -filename. - -Files: -lib/path-concat.h -lib/path-concat.c -m4/dos.m4 -m4/path-concat.m4 - -Depends-on: -xalloc -dirname - -configure.ac: -gl_PATH_CONCAT - -Makefile.am: - -Include: -"path-concat.h" - -License: -GPL - -Maintainer: -Jim Meyering |