X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fconcat-filename.c;h=732df11c9da3c57574971452b54a6ec90927828a;hb=318f05f156b5ebe583931d156186ed85ef4361ee;hp=a1d22fa541f18c9c4a4b058286ec3c7af623405b;hpb=27dbed51f810014b4d495bf69ab41c423e2eb15d;p=gnulib.git

diff --git a/lib/concat-filename.c b/lib/concat-filename.c
index a1d22fa54..732df11c9 100644
--- a/lib/concat-filename.c
+++ b/lib/concat-filename.c
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2006-2008 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -34,7 +34,7 @@
    upon memory allocation failure.  */
 char *
 concatenated_filename (const char *directory, const char *filename,
-		       const char *suffix)
+                       const char *suffix)
 {
   char *result;
   char *p;
@@ -43,28 +43,28 @@ concatenated_filename (const char *directory, const char *filename,
     {
       /* No need to prepend the directory.  */
       result = (char *) malloc (strlen (filename)
-				+ (suffix != NULL ? strlen (suffix) : 0)
-				+ 1);
+                                + (suffix != NULL ? strlen (suffix) : 0)
+                                + 1);
       if (result == NULL)
-	return NULL; /* errno is set here */
+        return NULL; /* errno is set here */
       p = result;
     }
   else
     {
       size_t directory_len = strlen (directory);
       int need_slash =
-	(directory_len > FILE_SYSTEM_PREFIX_LEN (directory)
-	 && !ISSLASH (directory[directory_len - 1]));
+        (directory_len > FILE_SYSTEM_PREFIX_LEN (directory)
+         && !ISSLASH (directory[directory_len - 1]));
       result = (char *) malloc (directory_len + need_slash
-				+ strlen (filename)
-				+ (suffix != NULL ? strlen (suffix) : 0)
-				+ 1);
+                                + strlen (filename)
+                                + (suffix != NULL ? strlen (suffix) : 0)
+                                + 1);
       if (result == NULL)
-	return NULL; /* errno is set here */
+        return NULL; /* errno is set here */
       memcpy (result, directory, directory_len);
       p = result + directory_len;
       if (need_slash)
-	*p++ = '/';
+        *p++ = '/';
     }
   p = stpcpy (p, filename);
   if (suffix != NULL)