canonicalize names on command line and ignore dups

[unix-history] / usr / src / sbin / restore / utilities.c

diff --git a/usr/src/sbin/restore/utilities.c b/usr/src/sbin/restore/utilities.c
index 03f7e97..b51a116 100644 (file)
--- a/usr/src/sbin/restore/utilities.c
+++ b/usr/src/sbin/restore/utilities.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1983 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1983 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)utilities.c        3.3     (Berkeley)      83/02/27";
+static char sccsid[] = "@(#)utilities.c        3.4     (Berkeley)      83/02/28";

 #endif
 
 #include "restore.h"
 #endif
 
 #include "restore.h"


@@ -271,6 +271,26 @@ badentry(ep, msg)
        panic("flags: %s\n", &flagbuf[1]);
 }
 
        panic("flags: %s\n", &flagbuf[1]);
 }
 

+/*
+ * canonicalize file names to always start with ``./''
+ */
+canon(rawname, canonname)
+       char *rawname, *canonname;
+{
+       int len;
+
+       if (strcmp(rawname, ".") == 0 || strncmp(rawname, "./", 2) == 0)
+               strcpy(canonname, "");
+       else if (rawname[0] == '/')
+               strcpy(canonname, ".");
+       else
+               strcpy(canonname, "./");
+       strcat(canonname, rawname);
+       len = strlen(canonname) - 1;
+       if (canonname[len] == '/')
+               canonname[len] = '\0';
+}
+

 /*
  * elicit a reply
  */
 /*
  * elicit a reply
  */