Mercurial > hg > octave-kai > gnulib-hg

annotate lib/basename.c @ 5907:c47674a83a78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Paul Eggert <eggert@cs.ucla.edu>
date Thu, 02 Jun 2005 20:41:04 +0000
parents a48fb0e98c8c
children 96c32553b4c6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5907
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5848
diff changeset
1 /* basename.c -- return the last element in a file name
4633
74b0d8b988f7 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 3243
diff changeset
2
5907
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5848
diff changeset
3 Copyright (C) 1990, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free
5122
d5943c753225 filesystem -> file system
Paul Eggert <eggert@cs.ucla.edu>
parents: 4633
diff changeset
4 Software Foundation, Inc.
1250
29ccc7d6e9e9 add copyright
Jim Meyering <jim@meyering.net>
parents: 958
diff changeset
5
29ccc7d6e9e9 add copyright
Jim Meyering <jim@meyering.net>
parents: 958
diff changeset
6 This program is free software; you can redistribute it and/or modify
29ccc7d6e9e9 add copyright
Jim Meyering <jim@meyering.net>
parents: 958
diff changeset
7 it under the terms of the GNU General Public License as published by
29ccc7d6e9e9 add copyright
Jim Meyering <jim@meyering.net>
parents: 958
diff changeset
8 the Free Software Foundation; either version 2, or (at your option)
29ccc7d6e9e9 add copyright
Jim Meyering <jim@meyering.net>
parents: 958
diff changeset
9 any later version.
29ccc7d6e9e9 add copyright
Jim Meyering <jim@meyering.net>
parents: 958
diff changeset
10
29ccc7d6e9e9 add copyright
Jim Meyering <jim@meyering.net>
parents: 958
diff changeset
11 This program is distributed in the hope that it will be useful,
29ccc7d6e9e9 add copyright
Jim Meyering <jim@meyering.net>
parents: 958
diff changeset
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
29ccc7d6e9e9 add copyright
Jim Meyering <jim@meyering.net>
parents: 958
diff changeset
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
29ccc7d6e9e9 add copyright
Jim Meyering <jim@meyering.net>
parents: 958
diff changeset
14 GNU General Public License for more details.
29ccc7d6e9e9 add copyright
Jim Meyering <jim@meyering.net>
parents: 958
diff changeset
15
29ccc7d6e9e9 add copyright
Jim Meyering <jim@meyering.net>
parents: 958
diff changeset
16 You should have received a copy of the GNU General Public License
29ccc7d6e9e9 add copyright
Jim Meyering <jim@meyering.net>
parents: 958
diff changeset
17 along with this program; if not, write to the Free Software Foundation,
5848
a48fb0e98c8c *** empty log message ***
Paul Eggert <eggert@cs.ucla.edu>
parents: 5122
diff changeset
18 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
19
922
9cb09b60925d Update from FSF via patch-2.2.93.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
20 #if HAVE_CONFIG_H
653
b63f146fd963 indent cpp-directives
Jim Meyering <jim@meyering.net>
parents: 650
diff changeset
21 # include <config.h>
379
0c05dc8a5d05 (basename): Use strrchr, not rindex.
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
22 #endif
0c05dc8a5d05 (basename): Use strrchr, not rindex.
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
23
3243
025019cda2d6 Use "", not <> to include dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3241
diff changeset
24 #include "dirname.h"
4633
74b0d8b988f7 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 3243
diff changeset
25 #include <string.h>
1952
8c28becce781 (base_name): Add prototype. From Akim Demaille.
Jim Meyering <jim@meyering.net>
parents: 1738
diff changeset
26
922
9cb09b60925d Update from FSF via patch-2.2.93.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
27 /* In general, we can't use the builtin `basename' function if available,
9cb09b60925d Update from FSF via patch-2.2.93.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
28 since it has different meanings in different environments.
1737
c6a6decaf2ad (base_name): If NAME is all slashes, return `/' (in
Jim Meyering <jim@meyering.net>
parents: 1251
diff changeset
29 In some environments the builtin `basename' modifies its argument.
3241
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
30
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
31 Return the address of the last file name component of NAME. If
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
32 NAME has no file name components because it is all slashes, return
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
33 NAME if it is empty, the address of its last slash otherwise. */
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
34
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
35 char *
1251
d7d7a33a5fd3 capitalize macro params and protoize
Jim Meyering <jim@meyering.net>
parents: 1250
diff changeset
36 base_name (char const *name)
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
37 {
5122
d5943c753225 filesystem -> file system
Paul Eggert <eggert@cs.ucla.edu>
parents: 4633
diff changeset
38 char const *base = name + FILE_SYSTEM_PREFIX_LEN (name);
1737
c6a6decaf2ad (base_name): If NAME is all slashes, return `/' (in
Jim Meyering <jim@meyering.net>
parents: 1251
diff changeset
39 char const *p;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
40
3241
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
41 for (p = base; *p; p++)
1737
c6a6decaf2ad (base_name): If NAME is all slashes, return `/' (in
Jim Meyering <jim@meyering.net>
parents: 1251
diff changeset
42 {
c6a6decaf2ad (base_name): If NAME is all slashes, return `/' (in
Jim Meyering <jim@meyering.net>
parents: 1251
diff changeset
43 if (ISSLASH (*p))
3241
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
44 {
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
45 /* Treat multiple adjacent slashes like a single slash. */
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
46 do p++;
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
47 while (ISSLASH (*p));
1737
c6a6decaf2ad (base_name): If NAME is all slashes, return `/' (in
Jim Meyering <jim@meyering.net>
parents: 1251
diff changeset
48
3241
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
49 /* If the file name ends in slash, use the trailing slash as
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
50 the basename if no non-slashes have been found. */
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
51 if (! *p)
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
52 {
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
53 if (ISSLASH (*base))
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
54 base = p - 1;
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
55 break;
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
56 }
922
9cb09b60925d Update from FSF via patch-2.2.93.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
57
3241
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
58 /* *P is a non-slash preceded by a slash. */
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
59 base = p;
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
60 }
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
61 }
2763
8a832ac25a04 (base_name): Add an assertion.
Jim Meyering <jim@meyering.net>
parents: 2718
diff changeset
62
590
cf44c49093fd (basename): Rewrite so it doesn't rely on strrchr,
Jim Meyering <jim@meyering.net>
parents: 421
diff changeset
63 return (char *) base;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
64 }
3241
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
65
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
66 /* Return the length of of the basename NAME. Typically NAME is the
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
67 value returned by base_name. Act like strlen (NAME), except omit
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
68 redundant trailing slashes. */
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
69
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
70 size_t
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
71 base_len (char const *name)
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
72 {
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
73 size_t len;
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
74
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
75 for (len = strlen (name); 1 < len && ISSLASH (name[len - 1]); len--)
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
76 continue;
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
77
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
78 return len;
3de6cd0813b1 (FILESYSTEM_PREFIX_LEN, PARAMS, ISSLASH): Remove; now in dirname.h.
Jim Meyering <jim@meyering.net>
parents: 3107
diff changeset
79 }