X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Ffolder.c;h=a94f1315ff94a83c5e9fe702280f2ced870f87f4;hp=b332af06110b092534c4e33a81f54318457f0047;hb=9be69008c0dd066816b4a9b04d47fade2282664a;hpb=0cebd8284370988c8b1807ef2544bd80804d074e

diff --git a/uip/folder.c b/uip/folder.c
index b332af0..a94f131 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -135,7 +135,6 @@ main (int argc, char **argv)
     int pushsw = 0, popsw = 0;
     char *cp, *dp, *msg = NULL, *argfolder = NULL;
     char **ap, **argp, buf[BUFSIZ], **arguments;
-    struct stat st;
 
 #ifdef LOCALE
     setlocale(LC_ALL, "");
@@ -260,7 +259,7 @@ main (int argc, char **argv)
 	    if (argfolder)
 		adios (NULL, "only one folder at a time!");
 	    else
-		argfolder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+		argfolder = pluspath (cp);
 	} else {
 	    if (msg)
 		adios (NULL, "only one (current) message at a time!");
@@ -366,6 +365,9 @@ main (int argc, char **argv)
 	/*
 	 * If no folder is given, do them all
 	 */
+	/* change directory to base of nmh directory for dodir */
+	if (chdir (nmhdir) == NOTOK)
+	    adios (nmhdir, "unable to change directory to");
 	if (!argfolder) {
 	    if (msg)
 		admonish (NULL, "no folder given for message %s", msg);
@@ -406,7 +408,8 @@ main (int argc, char **argv)
     print_folders();
 
     context_save ();	/* save the context file */
-    return done (0);
+    done (0);
+    return 1;
 }
 
 /*
@@ -419,15 +422,10 @@ dodir (char *dir)
     int i;
     int os = start;
     int of = foldp;
-    char buffer[BUFSIZ];
 
     start = foldp;
 
-    /* change directory to base of nmh directory */
-    if (chdir (nmhdir) == NOTOK)
-	adios (nmhdir, "unable to change directory to");
-
-    addir (strncpy (buffer, dir, sizeof(buffer)));
+    addir (dir);
 
     for (i = start; i < foldp; i++) {
 	get_folder_info (folds[i], NULL);
@@ -442,7 +440,6 @@ static int
 get_folder_info (char *fold, char *msg)
 {
     int	i, retval = 1;
-    char *mailfile;
     struct msgs *mp = NULL;
 
     i = total_folders++;
@@ -464,42 +461,36 @@ get_folder_info (char *fold, char *msg)
     fi[i].others = 0;
     fi[i].error  = 0;
 
-    mailfile = m_maildir (fold);
-
-    if (!chdir (mailfile)) {
-	if ((ftotal > 0) || !fshort || msg || fpack) {
-	    /*
-	     * create message structure and get folder info
-	     */
-	    if (!(mp = folder_read (fold))) {
-		admonish (NULL, "unable to read folder %s", fold);
-		return 0;
-	    }
-
-	    /* set the current message */
-	    if (msg && !sfold (mp, msg))
-		retval = 0;
+    if ((ftotal > 0) || !fshort || msg || fpack) {
+	/*
+	 * create message structure and get folder info
+	 */
+	if (!(mp = folder_read (fold))) {
+	    admonish (NULL, "unable to read folder %s", fold);
+	    return 0;
+	}
 
-	    if (fpack) {
-		if (folder_pack (&mp, fverb) == -1)
-		    done (1);
-		seq_save (mp);		/* synchronize the sequences */
-		context_save ();	/* save the context file     */
-	    }
+	/* set the current message */
+	if (msg && !sfold (mp, msg))
+	    retval = 0;
 
-	    /* record info for this folder */
-	    if ((ftotal > 0) || !fshort) {
-		fi[i].nummsg = mp->nummsg;
-		fi[i].curmsg = mp->curmsg;
-		fi[i].lowmsg = mp->lowmsg;
-		fi[i].hghmsg = mp->hghmsg;
-		fi[i].others = other_files (mp);
-	    }
+	if (fpack) {
+	    if (folder_pack (&mp, fverb) == -1)
+		done (1);
+	    seq_save (mp);		/* synchronize the sequences */
+	    context_save ();	/* save the context file     */
+	}
 
-	    folder_free (mp); /* free folder/message structure */
+	/* record info for this folder */
+	if ((ftotal > 0) || !fshort) {
+	    fi[i].nummsg = mp->nummsg;
+	    fi[i].curmsg = mp->curmsg;
+	    fi[i].lowmsg = mp->lowmsg;
+	    fi[i].hghmsg = mp->hghmsg;
+	    fi[i].others = other_files (mp);
 	}
-    } else {
-	fi[i].error = 1;
+
+	folder_free (mp); /* free folder/message structure */
     }
 
     if (frecurse && (fshort || fi[i].others) && (fi[i].error == 0))
@@ -666,58 +657,53 @@ sfold (struct msgs *mp, char *msg)
 static void
 addir (char *name)
 {
-    int nlink;
-    char *base, *cp;
+    char *prefix, *child;
     struct stat st;
     struct dirent *dp;
     DIR * dd;
+    int child_is_folder;
 
-    cp = name + strlen (name);
-    *cp++ = '/';
-    *cp = '\0';
-
-    /*
-     * A hack to skip over a leading
-     * "./" in folder names.
-     */
-    base = strcmp (name, "./") ? name : name + 2;
-
-   /* short-cut to see if directory has any sub-directories */
-    if (stat (name, &st) != -1 && st.st_nlink == 2)
-        return;
- 
     if (!(dd = opendir (name))) {
 	admonish (name, "unable to read directory ");
 	return;
     }
 
-    /*
-     * Keep track of the number of directories we've seen
-     * so we can quit stat'ing early, if we've seen them all.
-     */
-    nlink = st.st_nlink;
+    if (strcmp (name, ".") == 0) {
+	prefix = getcpy ("");
+    } else {
+	prefix = concat (name, "/", (void *)NULL);
+    }
 
-    while (nlink && (dp = readdir (dd))) {
-	if (!strcmp (dp->d_name, ".") || !strcmp (dp->d_name, "..")) {
-	    nlink--;
+    while ((dp = readdir (dd))) {
+	/* If the system supports it, try to skip processing of children we
+	 * know are not directories or symlinks. */
+	child_is_folder = -1;
+#if defined(HAVE_STRUCT_DIRENT_D_TYPE)
+	if (dp->d_type == DT_DIR) {
+	    child_is_folder = 1;
+	} else if (dp->d_type != DT_LNK && dp->d_type != DT_UNKNOWN) {
 	    continue;
 	}
-	if (cp + NLENGTH(dp) + 2 >= name + BUFSIZ)
+#endif
+	if (!strcmp (dp->d_name, ".") || !strcmp (dp->d_name, "..")) {
 	    continue;
-	strcpy (cp, dp->d_name);
-	if (stat (name, &st) != -1 && S_ISDIR(st.st_mode)) {
-	    /*
-	     * Check if this was really a symbolic link pointing at
-	     * a directory.  If not, then decrement link count.
-	     */
-	    if (lstat (name, &st) == -1)
-		nlink--;
-	    addfold (base);
+	}
+	child = concat (prefix, dp->d_name, (void *)NULL);
+	/* If we have no d_type or d_type is DT_LNK or DT_UNKNOWN, stat the
+	 * child to see what it is. */
+	if (child_is_folder == -1) {
+	    child_is_folder = (stat (child, &st) != -1 && S_ISDIR(st.st_mode));
+	}
+	if (child_is_folder) {
+	    /* addfold saves child in the list, don't free it */
+	    addfold (child);
+	} else {
+	    free (child);
 	}
     }
 
     closedir (dd);
-    *--cp = '\0';
+    free(prefix);
 }
 
 /*
@@ -729,7 +715,6 @@ static void
 addfold (char *fold)
 {
     register int i, j;
-    register char *cp;
 
     /* if necessary, reallocate the space for folder names */
     if (foldp >= maxfolders) {
@@ -737,17 +722,16 @@ addfold (char *fold)
 	folds = mh_xrealloc (folds, maxfolders * sizeof(char *));
     }
 
-    cp = getcpy (fold);
     for (i = start; i < foldp; i++)
-	if (compare (cp, folds[i]) < 0) {
+	if (compare (fold, folds[i]) < 0) {
 	    for (j = foldp - 1; j >= i; j--)
 		folds[j + 1] = folds[j];
 	    foldp++;
-	    folds[i] = cp;
+	    folds[i] = fold;
 	    return;
 	}
 
-    folds[foldp++] = cp;
+    folds[foldp++] = fold;
 }