src/usr.bin/patch/backupfile.c - diff

Return to backupfile.c CVS log

Up to [local] / src / usr.bin / patch

Diff for /src/usr.bin/patch/backupfile.c between version 1.5 and 1.6

-version 1.5, 1999/01/03 04:49:28
+version 1.6, 1999/01/03 05:33:48
 Line 21
 Line 21
 Line 21
  #include <stdlib.h>
  #include <string.h>
  #include <ctype.h>
+ #include <libgen.h>
  #include <sys/types.h>
  #include "backupfile.h"
  #include "config.h"
-Line 72
+Line 73
 Line 72
 Line 73
     to numbered) backup file name. */
  char *simple_backup_suffix = "~";
- char *basename ();
- char *dirname ();
  static char *concat ();
  char *find_backup_file_name ();
  static char *make_version_name ();
-Line 107
+Line 106
 Line 107
 Line 106
      }
    highest_backup = max_backup_version (base_versions, dir);
    free (base_versions);
-   free (dir);
    if (backup_type == numbered_existing && highest_backup == 0)
      return concat (file, simple_backup_suffix);
    return make_version_name (file, highest_backup + 1);
-Line 205
+Line 203
 Line 205
 Line 203
    strcpy (newstr, str1);
    strcpy (newstr + str1_length, str2);
    return newstr;
- }
- /* Return NAME with any leading path stripped off.  */
- char *
- basename (name)
-      char *name;
- {
-   char *base;
-   base = strrchr (name, '/');
-   return base ? base + 1 : name;
- }
- /* Return the leading directories part of PATH,
-    allocated with malloc.  If out of memory, return 0.
-    Assumes that trailing slashes have already been
-    removed.  */
- char *
- dirname (path)
-      char *path;
- {
-   char *newpath;
-   char *slash;
-   int length;    /* Length of result, not including NUL. */
-   slash = strrchr (path, '/');
-   if (slash == 0)
-         {
-           /* File is in the current directory.  */
-           path = ".";
-           length = 1;
-         }
-   else
-         {
-           /* Remove any trailing slashes from result. */
-           while (slash > path && *slash == '/')
-                 --slash;
-           length = slash - path + 1;
-         }
-   newpath = malloc (length + 1);
-   if (newpath == 0)
-     return 0;
-   strncpy (newpath, path, length);
-   newpath[length] = 0;
-   return newpath;
  }
  /* If ARG is an unambiguous match for an element of the