X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=restore%2Fdirs.c;h=228877733a4388fd90cb82c91315142ffd91790b;hb=1c736b782dfb4cf419bc53bcc795537585a283bc;hp=60f5b23673b15eebe42576aa3887ded3b2e8c894;hpb=5d2a3d246d400d45dfd4c49ddb588c69fb60873d;p=dump.git

diff --git a/restore/dirs.c b/restore/dirs.c
index 60f5b23..2288777 100644
--- a/restore/dirs.c
+++ b/restore/dirs.c
@@ -46,7 +46,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: dirs.c,v 1.17 2002/01/25 15:08:59 stelian Exp $";
+	"$Id: dirs.c,v 1.21 2002/07/19 14:57:39 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -140,7 +140,7 @@ struct odirect {
 	char	d_name[ODIRSIZ];
 };
 
-#ifdef	__linux__
+#if defined(__linux__) || defined(sunos)
 static struct inotab	*allocinotab __P((dump_ino_t, struct new_bsd_inode *, long));
 #else
 static struct inotab	*allocinotab __P((dump_ino_t, struct dinode *, long));
@@ -165,7 +165,7 @@ void
 extractdirs(int genmode)
 {
 	int i;
-#ifdef	__linux__
+#if defined(__linux__) || defined(sunos)
 	struct new_bsd_inode *ip;
 #else
 	struct dinode *ip;
@@ -276,7 +276,7 @@ treescan(char *pname, dump_ino_t ino, long (*todo) __P((char *, dump_ino_t, int)
 	 * skipping over "." and ".."
 	 */
 	namelen = snprintf(locname, sizeof(locname), "%s/", pname);
-	if (namelen >= sizeof(locname))
+	if (namelen >= (int)sizeof(locname))
 		namelen = sizeof(locname) - 1;
 	rst_seekdir(dirp, itp->t_seekpt, itp->t_seekpt);
 	dp = rst_readdir(dirp); /* "." */
@@ -296,7 +296,7 @@ treescan(char *pname, dump_ino_t ino, long (*todo) __P((char *, dump_ino_t, int)
 	 */
 	while (dp != NULL) {
 		locname[namelen] = '\0';
-		if (namelen + dp->d_namlen >= sizeof(locname)) {
+		if (namelen + dp->d_namlen >= (int)sizeof(locname)) {
 			fprintf(stderr, "%s%s: name exceeds %ld char\n",
 				locname, dp->d_name, (long)sizeof(locname) - 1);
 		} else {
@@ -325,7 +325,11 @@ pathsearch(const char *pathname)
 	while (*path == '/')
 		path++;
 	dp = NULL;
+#ifdef __linux__
 	while ((name = strsep(&path, "/")) != NULL && *name /* != NULL */) {
+#else
+	while ((name = strtok_r(NULL, "/", &path)) != NULL && *name /* != NULL */) {
+#endif
 		if ((dp = searchdir(ino, name)) == NULL)
 			return (NULL);
 		ino = dp->d_ino;
@@ -377,7 +381,7 @@ putdir(char *buf, size_t size)
 				putent(&cvtbuf);
 			}
 	} else {
-		for (loc = 0; loc < size; ) {
+		for (loc = 0; loc < (long)size; ) {
 			dp = (struct direct *)(buf + loc);
 #ifdef	DIRDEBUG
 			printf ("reclen = %d, namlen = %d, type = %d\n",
@@ -393,6 +397,8 @@ putdir(char *buf, size_t size)
 					if (!Bcvt)
 						dp->d_namlen = dp->d_type;
 #				endif
+				if (dp->d_namlen == 0 && dp->d_type != 0)
+					dp->d_namlen = dp->d_type;
 				dp->d_type = DT_UNKNOWN;
 			}
 #ifdef	DIRDEBUG
@@ -431,9 +437,9 @@ putdir(char *buf, size_t size)
 /*
  * These variables are "local" to the following two functions.
  */
-char dirbuf[DIRBLKSIZ];
-long dirloc = 0;
-long prev = 0;
+static char dirbuf[DIRBLKSIZ];
+static long dirloc = 0;
+static long prev = 0;
 
 /*
  * add a new directory entry to a file.
@@ -643,7 +649,8 @@ setdirmodes(int flags)
 				ep->e_flags &= ~NEW;
 				continue;
 			}
-			if (node.ino == ROOTINO &&
+			if ((flags & FORCE) == 0 &&
+			    node.ino == ROOTINO &&
 		   	    reply("set owner/mode for '.'") == FAIL)
 				continue;
 		}