annotate lib/concat-filename.c @ 16366:bb182ee4a09d

maint: replace FSF snail-mail addresses with URLs * config/argz.mk, lib/accept4.c, lib/alignof.h, lib/alloca.in.h: * lib/alphasort.c, lib/arcfour.c, lib/arcfour.h, lib/arctwo.c: * lib/arctwo.h, lib/argz.c, lib/arpa_inet.in.h, lib/asnprintf.c: * lib/asprintf.c, lib/assert.in.h, lib/base32.c, lib/base32.h: * lib/base64.c, lib/base64.h, lib/c-ctype.c, lib/c-ctype.h: * lib/c-strcase.h, lib/c-strcasecmp.c, lib/c-strncasecmp.c: * lib/check-version.c, lib/check-version.h, lib/config.charset: * lib/ctype.in.h, lib/des.c, lib/des.h, lib/dup3.c, lib/errno.in.h: * lib/float+.h, lib/fnmatch.c, lib/fnmatch.in.h, lib/fnmatch_loop.c: * lib/fseeko.c, lib/gai_strerror.c, lib/gc-gnulib.c: * lib/gc-libgcrypt.c, lib/gc-pbkdf2-sha1.c, lib/gc.h: * lib/getaddrinfo.c, lib/getdelim.c, lib/getfilecon.c, lib/getline.c: * lib/getlogin_r.c, lib/getpass.c, lib/getpass.h, lib/gettext.h: * lib/gettimeofday.c, lib/glob.in.h, lib/glthread/cond.c: * lib/glthread/cond.h, lib/glthread/lock.c, lib/glthread/lock.h: * lib/glthread/thread.c, lib/glthread/thread.h: * lib/glthread/threadlib.c, lib/glthread/yield.h, lib/hmac-md5.c: * lib/hmac-sha1.c, lib/hmac.h, lib/iconv.c, lib/iconv.in.h: * lib/iconv_close.c, lib/iconv_open.c, lib/inet_ntop.c, lib/isfinite.c: * lib/isinf.c, lib/iswblank.c, lib/langinfo.in.h, lib/link.c: * lib/localcharset.c, lib/localcharset.h, lib/lseek.c, lib/malloc.c: * lib/malloca.c, lib/malloca.h, lib/md2.c, lib/md2.h, lib/md4.c: * lib/md4.h, lib/md5.c, lib/md5.h, lib/memmem.c, lib/mempcpy.c: * lib/memset.c, lib/memxor.c, lib/memxor.h, lib/minmax.h, lib/mktime.c: * lib/msvc-inval.c, lib/msvc-inval.h, lib/msvc-nothrow.c: * lib/msvc-nothrow.h, lib/netdb.in.h, lib/netinet_in.in.h, lib/nproc.c: * lib/nproc.h, lib/obstack_printf.c, lib/pathmax.h, lib/pipe.c: * lib/pipe2.c, lib/poll.c, lib/poll.in.h, lib/printf-args.c: * lib/printf-args.h, lib/printf-parse.c, lib/printf-parse.h: * lib/pselect.c, lib/pthread.in.h, lib/pty-private.h, lib/pty.in.h: * lib/read-file.c, lib/read-file.h, lib/ref-add.sin, lib/ref-del.sin: * lib/regcomp.c, lib/regex.c, lib/regex.h, lib/regex_internal.c: * lib/regex_internal.h, lib/regexec.c, lib/rijndael-alg-fst.c: * lib/rijndael-alg-fst.h, lib/rijndael-api-fst.c: * lib/rijndael-api-fst.h, lib/rint.c, lib/rintf.c, lib/rintl.c: * lib/round.c, lib/roundf.c, lib/roundl.c, lib/scandir.c, lib/select.c: * lib/sha1.c, lib/sha1.h, lib/size_max.h, lib/snprintf.c: * lib/stdalign.in.h, lib/stdarg.in.h, lib/stdbool.in.h: * lib/stddef.in.h, lib/stdint.in.h, lib/stdio.in.h, lib/str-kmp.h: * lib/str-two-way.h, lib/strcasecmp.c, lib/strcasestr.c, lib/strdup.c: * lib/striconv.c, lib/striconv.h, lib/string.in.h, lib/strings.in.h: * lib/strncasecmp.c, lib/strndup.c, lib/strnlen.c, lib/strpbrk.c: * lib/strptime.c, lib/strsep.c, lib/strstr.c, lib/strverscmp.c: * lib/sys_file.in.h, lib/sys_ioctl.in.h, lib/sys_select.in.h: * lib/sys_socket.in.h, lib/sys_stat.in.h, lib/sys_time.in.h: * lib/sys_times.in.h, lib/sys_types.in.h, lib/sys_uio.in.h: * lib/sys_utsname.in.h, lib/sys_wait.in.h, lib/tcgetsid.c: * lib/termios.in.h, lib/time.in.h, lib/time_r.c, lib/timegm.c: * lib/times.c, lib/unictype/3level.h, lib/unictype/3levelbit.h: * lib/unistd.in.h, lib/vasnprintf.c, lib/vasnprintf.h, lib/vasprintf.c: * lib/vsnprintf.c, lib/waitpid.c, lib/wchar.in.h, lib/wctype.in.h: * lib/xsize.h, tests/test-closein.c, tests/test-des.c: * tests/test-fclose.c, tests/test-fgetc.c, tests/test-filevercmp.c: * tests/test-fputc.c, tests/test-fread.c, tests/test-fwrite.c: * tests/test-gc-arcfour.c, tests/test-gc-arctwo.c, tests/test-gc-des.c: * tests/test-gc-hmac-md5.c, tests/test-gc-hmac-sha1.c: * tests/test-gc-md2.c, tests/test-gc-md4.c, tests/test-gc-md5.c: * tests/test-gc-pbkdf2-sha1.c, tests/test-gc-rijndael.c: * tests/test-gc-sha1.c, tests/test-gc.c, tests/test-getdelim.c: * tests/test-getline.c, tests/test-getndelim2.c, tests/test-md2.c: * tests/test-md4.c, tests/test-parse-datetime.c, tests/test-perror.c: * tests/test-perror2.c, tests/test-pipe.c, tests/test-pipe2.c: * tests/test-poll.c, tests/test-quotearg-simple.c: * tests/test-quotearg.c, tests/test-quotearg.h: * tests/test-round-ieee.c, tests/test-round1.c: * tests/test-roundf-ieee.c, tests/test-roundf1.c: * tests/test-roundl-ieee.c, tests/test-roundl.c: * tests/test-safe-alloc.c, tests/test-sigpipe.c: * tests/test-spawn-pipe-child.c, tests/test-spawn-pipe-main.c: * tests/test-strerror.c, tests/test-strerror_r.c: * tests/test-strsignal.c, tests/test-strverscmp.c: * tests/test-xmemdup0.c: Replace FSF snail mail addresses with URLs, as per GNU coding standards. See glibc bug <http://sourceware.org/bugzilla/show_bug.cgi?id=13673>.
author Paul Eggert <eggert@cs.ucla.edu>
date Thu, 09 Feb 2012 21:39:05 -0800
parents 8250f2777afc
children e542fd46ad6f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10390
247990850251 Split module 'filename' into 'filename' and 'concat-filename'.
Bruno Haible <bruno@clisp.org>
parents: 9309
diff changeset
1 /* Construct a full filename from a directory and a relative filename.
16201
8250f2777afc maint: update all copyright year number ranges
Jim Meyering <meyering@redhat.com>
parents: 14079
diff changeset
2 Copyright (C) 2001-2004, 2006-2012 Free Software Foundation, Inc.
8249
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 8251
diff changeset
4 This program is free software: you can redistribute it and/or modify it
8249
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
5 under the terms of the GNU General Public License as published by the
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 8251
diff changeset
6 Free Software Foundation; either version 3 of the License, or any
8249
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
7 later version.
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
8
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
9 This program is distributed in the hope that it will be useful,
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
12 GNU General Public License for more details.
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
13
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
14 You should have received a copy of the GNU General Public License
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 8251
diff changeset
15 along with this program. If not, see <http://www.gnu.org/licenses/>. */
8249
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
16
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
17 /* Written by Bruno Haible <haible@clisp.cons.org>. */
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
18
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
19 #include <config.h>
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
20
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
21 /* Specification. */
10390
247990850251 Split module 'filename' into 'filename' and 'concat-filename'.
Bruno Haible <bruno@clisp.org>
parents: 9309
diff changeset
22 #include "concat-filename.h"
8249
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
23
10391
f0a681493fa6 New module 'xconcat-filename', split off from module 'concat-filename'.
Bruno Haible <bruno@clisp.org>
parents: 10390
diff changeset
24 #include <errno.h>
f0a681493fa6 New module 'xconcat-filename', split off from module 'concat-filename'.
Bruno Haible <bruno@clisp.org>
parents: 10390
diff changeset
25 #include <stdlib.h>
8249
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
26 #include <string.h>
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
27
10390
247990850251 Split module 'filename' into 'filename' and 'concat-filename'.
Bruno Haible <bruno@clisp.org>
parents: 9309
diff changeset
28 #include "filename.h"
8249
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
29
8251
1e16373508e1 Rename module 'pathname' to 'filename'.
Bruno Haible <bruno@clisp.org>
parents: 8249
diff changeset
30 /* Concatenate a directory filename, a relative filename and an optional
8249
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
31 suffix. The directory may end with the directory separator. The second
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
32 argument may not start with the directory separator (it is relative).
10391
f0a681493fa6 New module 'xconcat-filename', split off from module 'concat-filename'.
Bruno Haible <bruno@clisp.org>
parents: 10390
diff changeset
33 Return a freshly allocated filename. Return NULL and set errno
f0a681493fa6 New module 'xconcat-filename', split off from module 'concat-filename'.
Bruno Haible <bruno@clisp.org>
parents: 10390
diff changeset
34 upon memory allocation failure. */
8249
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
35 char *
8251
1e16373508e1 Rename module 'pathname' to 'filename'.
Bruno Haible <bruno@clisp.org>
parents: 8249
diff changeset
36 concatenated_filename (const char *directory, const char *filename,
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10391
diff changeset
37 const char *suffix)
8249
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
38 {
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
39 char *result;
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
40 char *p;
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
41
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
42 if (strcmp (directory, ".") == 0)
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
43 {
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
44 /* No need to prepend the directory. */
10391
f0a681493fa6 New module 'xconcat-filename', split off from module 'concat-filename'.
Bruno Haible <bruno@clisp.org>
parents: 10390
diff changeset
45 result = (char *) malloc (strlen (filename)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10391
diff changeset
46 + (suffix != NULL ? strlen (suffix) : 0)
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10391
diff changeset
47 + 1);
10391
f0a681493fa6 New module 'xconcat-filename', split off from module 'concat-filename'.
Bruno Haible <bruno@clisp.org>
parents: 10390
diff changeset
48 if (result == NULL)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10391
diff changeset
49 return NULL; /* errno is set here */
8249
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
50 p = result;
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
51 }
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
52 else
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
53 {
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
54 size_t directory_len = strlen (directory);
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
55 int need_slash =
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10391
diff changeset
56 (directory_len > FILE_SYSTEM_PREFIX_LEN (directory)
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10391
diff changeset
57 && !ISSLASH (directory[directory_len - 1]));
10391
f0a681493fa6 New module 'xconcat-filename', split off from module 'concat-filename'.
Bruno Haible <bruno@clisp.org>
parents: 10390
diff changeset
58 result = (char *) malloc (directory_len + need_slash
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10391
diff changeset
59 + strlen (filename)
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10391
diff changeset
60 + (suffix != NULL ? strlen (suffix) : 0)
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10391
diff changeset
61 + 1);
10391
f0a681493fa6 New module 'xconcat-filename', split off from module 'concat-filename'.
Bruno Haible <bruno@clisp.org>
parents: 10390
diff changeset
62 if (result == NULL)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10391
diff changeset
63 return NULL; /* errno is set here */
8249
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
64 memcpy (result, directory, directory_len);
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
65 p = result + directory_len;
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
66 if (need_slash)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10391
diff changeset
67 *p++ = '/';
8249
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
68 }
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
69 p = stpcpy (p, filename);
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
70 if (suffix != NULL)
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
71 stpcpy (p, suffix);
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
72 return result;
67026595be31 Move to here from concatpath.c.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
73 }