annotate lib/filenamecat.c @ 8051:9c2b0396b27c

Stylistic change: Use '#if HAVE_*' instead of '#ifdef HAVE_*'.
author Bruno Haible <bruno@clisp.org>
date Tue, 30 Jan 2007 01:07:22 +0000
parents 8a1a9361108c
children ffc5b7a10350
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:
diff changeset
1 /* Concatenate two arbitrary file names.
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
2
6912
314715e0260d Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6259
diff changeset
3 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
314715e0260d Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6259
diff changeset
4 2005, 2006 Free Software Foundation, Inc.
5907
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
5
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
6 This program is free software; you can redistribute it and/or modify
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
7 it under the terms of the GNU General Public License as published by
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
8 the Free Software Foundation; either version 2, or (at your option)
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
9 any later version.
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
10
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
11 This program is distributed in the hope that it will be useful,
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
14 GNU General Public License for more details.
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
15
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
17 along with this program; if not, write to the Free Software Foundation,
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
18 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
19
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
20 /* Written by Jim Meyering. */
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
21
7302
8a1a9361108c * _fpending.c: Include <config.h> unconditionally, since we no
Paul Eggert <eggert@cs.ucla.edu>
parents: 6912
diff changeset
22 #include <config.h>
5907
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
23
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
24 /* Specification. */
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
25 #include "filenamecat.h"
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
26
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
27 #include <string.h>
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
28
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
29 #include "dirname.h"
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
30 #include "xalloc.h"
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
31
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
32 #if ! HAVE_MEMPCPY && ! defined mempcpy
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
33 # define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N)))
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
34 #endif
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
35
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
36 /* Return the longest suffix of F that is a relative file name.
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
37 If it has no such suffix, return the empty string. */
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
38
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
39 static char const *
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
40 longest_relative_suffix (char const *f)
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
41 {
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
42 for (f += FILE_SYSTEM_PREFIX_LEN (f); ISSLASH (*f); f++)
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
43 continue;
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
44 return f;
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
45 }
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
46
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
47 /* Concatenate two file name components, DIR and ABASE, in
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
48 newly-allocated storage and return the result.
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
49 The resulting file name F is such that the commands "ls F" and "(cd
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
50 DIR; ls BASE)" refer to the same file, where BASE is ABASE with any
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
51 file system prefixes and leading separators removed.
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
52 Arrange for a directory separator if necessary between DIR and BASE
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
53 in the result, removing any redundant separators.
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
54 In any case, if BASE_IN_RESULT is non-NULL, set
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
55 *BASE_IN_RESULT to point to the copy of ABASE in the returned
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
56 concatenation. However, if ABASE begins with more than one slash,
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
57 set *BASE_IN_RESULT to point to the sole corresponding slash that
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
58 is copied into the result buffer.
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
59
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
60 Report an error if memory is exhausted. */
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
61
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
62 char *
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
63 file_name_concat (char const *dir, char const *abase, char **base_in_result)
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
64 {
6912
314715e0260d Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6259
diff changeset
65 char const *dirbase = last_component (dir);
5907
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
66 size_t dirbaselen = base_len (dirbase);
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
67 size_t dirlen = dirbase - dir + dirbaselen;
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
68 size_t needs_separator = (dirbaselen && ! ISSLASH (dirbase[dirbaselen - 1]));
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
69
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
70 char const *base = longest_relative_suffix (abase);
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
71 size_t baselen = strlen (base);
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
72
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
73 char *p_concat = xmalloc (dirlen + needs_separator + baselen + 1);
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
74 char *p;
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
75
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
76 p = mempcpy (p_concat, dir, dirlen);
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
77 *p = DIRECTORY_SEPARATOR;
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
78 p += needs_separator;
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
79
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
80 if (base_in_result)
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
81 *base_in_result = p - IS_ABSOLUTE_FILE_NAME (abase);
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
82
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
83 p = mempcpy (p, base, baselen);
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
84 *p = '\0';
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
85
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
86 return p_concat;
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
87 }
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
88
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
89 #ifdef TEST_FILE_NAME_CONCAT
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
90 # include <stdlib.h>
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
91 # include <stdio.h>
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
92 int
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
93 main ()
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
94 {
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
95 static char const *const tests[][3] =
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
96 {
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
97 {"a", "b", "a/b"},
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
98 {"a/", "b", "a/b"},
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
99 {"a/", "/b", "a/b"},
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
100 {"a", "/b", "a/b"},
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
101
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
102 {"/", "b", "/b"},
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
103 {"/", "/b", "/b"},
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
104 {"/", "/", "/"},
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
105 {"a", "/", "a/"}, /* this might deserve a diagnostic */
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
106 {"/a", "/", "/a/"}, /* this might deserve a diagnostic */
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
107 {"a", "//b", "a/b"},
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
108 };
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
109 size_t i;
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
110 bool fail = false;
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
111 for (i = 0; i < sizeof tests / sizeof tests[0]; i++)
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
112 {
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
113 char *base_in_result;
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
114 char const *const *t = tests[i];
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
115 char *res = file_name_concat (t[0], t[1], &base_in_result);
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
116 if (strcmp (res, t[2]) != 0)
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
117 {
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
118 printf ("got %s, expected %s\n", res, t[2]);
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
119 fail = true;
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
120 }
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
121 }
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
122 exit (fail ? EXIT_FAILURE : EXIT_SUCCESS);
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
123 }
c47674a83a78 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
diff changeset
124 #endif