X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fnew.c;h=de3c0be40c8e92c8ab00f53024df2d91af1adb6f;hp=49840a1bf8304b344544a2d1e60da8a7bcd7fa0b;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1

diff --git a/uip/new.c b/uip/new.c
index 49840a1..de3c0be 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -1,14 +1,14 @@
 /*
- * new.c -- as new,    list all folders with unseen messages
- *       -- as fnext,  move to next folder with unseen messages
- *       -- as fprev,  move to previous folder with unseen messages
- *       -- as unseen, scan all unseen messages
- * This code is Copyright (c) 2008, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- *
- * Inspired by Luke Mewburn's new: http://www.mewburn.net/luke/src/new
- */
+** new.c -- as new,    list all folders with unseen messages
+**       -- as fnext,  move to next folder with unseen messages
+**       -- as fprev,  move to previous folder with unseen messages
+**       -- as unseen, scan all unseen messages
+** This code is Copyright (c) 2008, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+**
+** Inspired by Luke Mewburn's new: http://www.mewburn.net/luke/src/new
+*/
 
 #include <sys/types.h>
 
@@ -26,7 +26,7 @@ static struct swit switches[] = {
 #define FOLDERSSW 1
 	{ "folders", 1 },
 #define VERSIONSW 2
-	{ "version", 1 },
+	{ "Version", 1 },
 #define HELPSW 3
 	{ "help", 1 },
 	{ NULL, 0 }
@@ -34,8 +34,10 @@ static struct swit switches[] = {
 
 static enum { NEW, FNEXT, FPREV, UNSEEN } run_mode = NEW;
 
-/* check_folders uses this to maintain state with both .folders list of
- * folders and with crawl_folders. */
+/*
+** check_folders uses this to maintain state with both .folders list of
+** folders and with crawl_folders.
+*/
 struct list_state {
 	struct node **first, **cur_node;
 	size_t *maxlen;
@@ -55,11 +57,11 @@ count_messages(char *field)
 	field = getcpy(field);
 
 	/* copied from seq_read.c:seq_init */
-	for (ap = brkstring (field, " ", "\n"); *ap; ap++) {
+	for (ap = brkstring(field, " ", "\n"); *ap; ap++) {
 		if ((cp = strchr(*ap, '-')))
 			*cp++ = '\0';
-		if ((j = m_atoi (*ap)) > 0) {
-			k = cp ? m_atoi (cp) : j;
+		if ((j = m_atoi(*ap)) > 0) {
+			k = cp ? m_atoi(cp) : j;
 
 			total += k - j + 1;
 		}
@@ -85,12 +87,14 @@ seq_in_list(char *name, char *sequences[])
 	return FALSE;
 }
 
-/* Return the string list of message numbers from the sequences file, or NULL
- * if none. */
+/*
+** Return the string list of message numbers from the sequences file,
+** or NULL if none.
+*/
 static char *
 get_msgnums(char *folder, char *sequences[])
 {
-	char *seqfile = concat(m_maildir(folder), "/", mh_seq, (void *)NULL);
+	char *seqfile = concat(toabsdir(folder), "/", mh_seq, (void *)NULL);
 	FILE *fp = fopen(seqfile, "r");
 	int state;
 	char name[NAMESZ], field[BUFSIZ];
@@ -104,63 +108,67 @@ get_msgnums(char *folder, char *sequences[])
 
 	/* copied from seq_read.c:seq_public */
 	for (state = FLD;;) {
-		switch (state = m_getfld (state, name, field, sizeof(field), fp)) {
-			case FLD:
-			case FLDPLUS:
-			case FLDEOF:
-				if (state == FLDPLUS) {
-					cp = getcpy (field);
-					while (state == FLDPLUS) {
-						state = m_getfld (state, name, field,
-										  sizeof(field), fp);
-						cp = add (field, cp);
-					}
+		switch (state = m_getfld(state, name, field, sizeof(field),
+				fp)) {
+		case FLD:
+		case FLDPLUS:
+		case FLDEOF:
+			if (state == FLDPLUS) {
+				cp = getcpy(field);
+				while (state == FLDPLUS) {
+					state = m_getfld(state, name, field,
+							sizeof(field), fp);
+					cp = add(field, cp);
+				}
 
-					/* Here's where we differ from seq_public: if it's in a
-					 * sequence we want, save the list of messages. */
-					if (seq_in_list(name, sequences)) {
-						this_msgnums = trimcpy(cp);
-						if (msgnums == NULL) {
-							msgnums = this_msgnums;
-						} else {
-							old_msgnums = msgnums;
-							msgnums = concat(old_msgnums, " ",
-											 this_msgnums, (void *)NULL);
-							free(old_msgnums);
-							free(this_msgnums);
-						}
+				/*
+				** Here's where we differ from
+				** seq_public: if it's in a
+				** sequence we want, save the list
+				** of messages.
+				*/
+				if (seq_in_list(name, sequences)) {
+					this_msgnums = trimcpy(cp);
+					if (msgnums == NULL) {
+						msgnums = this_msgnums;
+					} else {
+						old_msgnums = msgnums;
+						msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL);
+						free(old_msgnums);
+						free(this_msgnums);
 					}
-					free (cp);
-				} else {
-					/* and here */
-					if (seq_in_list(name, sequences)) {
-						this_msgnums = trimcpy(field);
-						if (msgnums == NULL) {
-							msgnums = this_msgnums;
-						} else {
-							old_msgnums = msgnums;
-							msgnums = concat(old_msgnums, " ",
-											 this_msgnums, (void *)NULL);
-							free(old_msgnums);
-							free(this_msgnums);
-						}
+				}
+				free(cp);
+			} else {
+				/* and here */
+				if (seq_in_list(name, sequences)) {
+					this_msgnums = trimcpy(field);
+					if (msgnums == NULL) {
+						msgnums = this_msgnums;
+					} else {
+						old_msgnums = msgnums;
+						msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL);
+						free(old_msgnums);
+						free(this_msgnums);
 					}
 				}
+			}
 
-				if (state == FLDEOF)
-					break;
-				continue;
+			if (state == FLDEOF)
+				break;
+			continue;
 
-			case BODY:
-			case BODYEOF:
-				adios (NULL, "no blank lines are permitted in %s", seqfile);
-				/* fall */
+		case BODY:
+		case BODYEOF:
+			adios(NULL, "no blank lines are permitted in %s",
+					seqfile);
+			/* fall */
 
-			case FILEEOF:
-				break;
+		case FILEEOF:
+			break;
 
-			default:
-				adios (NULL, "%s is poorly formatted", seqfile);
+		default:
+			adios(NULL, "%s is poorly formatted", seqfile);
 		}
 		break;  /* break from for loop */
 	}
@@ -170,8 +178,10 @@ get_msgnums(char *folder, char *sequences[])
 	return msgnums;
 }
 
-/* Check `folder' (of length `len') for interesting messages, filling in the
- * list in `b'. */
+/*
+** Check `folder' (of length `len') for interesting messages,
+** filling in the list in `b'.
+*/
 static void
 check_folder(char *folder, size_t len, struct list_state *b)
 {
@@ -206,20 +216,21 @@ crawl_callback(char *folder, void *baton)
 	return TRUE;
 }
 
-/* Scan folders, returning:
- * first        -- list of nodes for all folders which have desired messages;
- *                 if the current folder is listed in .folders, it is also in
- *                 the list regardless of whether it has any desired messages
- * last         -- last node in list
- * cur_node     -- node of current folder, if listed in .folders
- * maxlen       -- length of longest folder name
- *
- * `cur' points to the name of the current folder, `folders' points to the
- * name of a .folder (if NULL, crawl all folders), and `sequences' points to
- * the array of sequences for which to look.
- *
- * An empty list is returned as first=last=NULL.
- */
+/*
+** Scan folders, returning:
+** first        -- list of nodes for all folders which have desired messages;
+**                 if the current folder is listed in .folders, it is also in
+**                 the list regardless of whether it has any desired messages
+** last         -- last node in list
+** cur_node     -- node of current folder, if listed in .folders
+** maxlen       -- length of longest folder name
+**
+** `cur' points to the name of the current folder, `folders' points to the
+** name of a .folder (if NULL, crawl all folders), and `sequences' points to
+** the array of sequences for which to look.
+**
+** An empty list is returned as first=last=NULL.
+*/
 static void
 check_folders(struct node **first, struct node **last,
 	struct node **cur_node, size_t *maxlen,
@@ -240,7 +251,7 @@ check_folders(struct node **first, struct node **last,
 	b.sequences = sequences;
 
 	if (folders == NULL) {
-		chdir(m_maildir(""));
+		chdir(toabsdir("+"));
 		crawl_folders(".", crawl_callback, &b);
 	} else {
 		fp = fopen(folders, "r");
@@ -285,18 +296,19 @@ join_sequences(char *sequences[])
 	return result;
 }
 
-/* Return a struct node for the folder to change to.  This is the next
- * (previous, if FPREV mode) folder with desired messages, or the current
- * folder if no folders have desired.  If NEW or UNSEEN mode, print the
- * output but don't change folders.
- *
- * n_name is the folder to change to, and n_field is the string list of
- * desired message numbers.
- */
+/*
+** Return a struct node for the folder to change to.  This is the next
+** (previous, if FPREV mode) folder with desired messages, or the current
+** folder if no folders have desired.  If NEW or UNSEEN mode, print the
+** output but don't change folders.
+**
+** n_name is the folder to change to, and n_field is the string list of
+** desired message numbers.
+*/
 static struct node *
 doit(char *cur, char *folders, char *sequences[])
 {
-	struct node *first, *cur_node, *node, *last, *prev;
+	struct node *first, *cur_node, *node, *last = NULL, *prev;
 	size_t folder_len;
 	int count, total = 0;
 	char *command = NULL, *sequences_s = NULL;
@@ -306,21 +318,26 @@ doit(char *cur, char *folders, char *sequences[])
 	}
 
 	check_folders(&first, &last, &cur_node, &folder_len, cur,
-				  folders, sequences);
+			folders, sequences);
 
 	if (run_mode == FNEXT || run_mode == FPREV) {
 		if (first == NULL) {
 			/* No folders at all... */
 			return NULL;
 		} else if (first->n_next == NULL) {
-			/* We have only one node; any desired messages in it? */
+			/*
+			** We have only one node; any desired messages in it?
+			*/
 			if (first->n_field == NULL) {
 				return NULL;
 			} else {
 				return first;
 			}
 		} else if (cur_node == NULL) {
-			/* Current folder is not listed in .folders, return first. */
+			/*
+			** Current folder is not listed in .folders,
+			** return first.
+			*/
 			return first;
 		}
 	} else if (run_mode == UNSEEN) {
@@ -331,16 +348,20 @@ doit(char *cur, char *folders, char *sequences[])
 		 node != NULL;
 		 prev = node, node = node->n_next) {
 		if (run_mode == FNEXT) {
-			/* If we have a previous node and it is the current
-			 * folder, return this node. */
+			/*
+			** If we have a previous node and it is the current
+			** folder, return this node.
+			*/
 			if (prev != NULL && strcmp(prev->n_name, cur) == 0) {
 				return node;
 			}
 		} else if (run_mode == FPREV) {
 			if (strcmp(node->n_name, cur) == 0) {
-				/* Found current folder in fprev mode; if we have a
-				 * previous node in the list, return it; else return
-				 * the last node. */
+				/*
+				** Found current folder in fprev mode;
+				** if we have a previous node in the list,
+				** return it; else return the last node.
+				*/
 				if (prev == NULL) {
 					return last;
 				}
@@ -362,9 +383,12 @@ doit(char *cur, char *folders, char *sequences[])
 			}
 			fflush(stdout);
 
-			/* TODO: Split enough of scan.c out so that we can call it here. */
-			command = concat("scan +", node->n_name, " ", sequences_s,
-							 (void *)NULL);
+			/*
+			** TODO: Split enough of scan.c out so that we can
+			** call it here.
+			*/
+			command = concat("scan +", node->n_name, " ",
+					sequences_s, (void *)NULL);
 			system(command);
 			free(command);
 		} else {
@@ -375,16 +399,17 @@ doit(char *cur, char *folders, char *sequences[])
 			count = count_messages(node->n_field);
 			total += count;
 
-			printf("%-*s %6d.%c %s\n",
-				   (int) folder_len, node->n_name,
-				   count,
-				   (strcmp(node->n_name, cur) == 0 ? '*' : ' '),
-				   node->n_field);
+			printf("%-*s %6d.%c %s\n", (int) folder_len,
+				node->n_name, count,
+				(strcmp(node->n_name, cur) == 0 ? '*' : ' '),
+				node->n_field);
 		}
 	}
 
-	/* If we're fnext, we haven't checked the last node yet.  If it's the
-	 * current folder, return the first node. */
+	/*
+	** If we're fnext, we haven't checked the last node yet.  If it's the
+	** current folder, return the first node.
+	*/
 	if (run_mode == FNEXT && strcmp(last->n_name, cur) == 0) {
 		return first;
 	}
@@ -407,52 +432,59 @@ main(int argc, char **argv)
 	char *unseen;
 	struct node *folder;
 
+	sequences[0] = NULL;
+	sequences[1] = NULL;
+
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
-	invo_name = r1bindex(argv[0], '/');
+	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
 	context_read();
 
-	arguments = getarguments (invo_name, argc, argv, 1);
+	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
 	/*
-	 * Parse arguments
-	 */
+	** Parse arguments
+	*/
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
-			switch (smatch (++cp, switches)) {
+			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
-				ambigsw (cp, switches);
-				done (1);
+				ambigsw(cp, switches);
+				done(1);
 			case UNKWNSW:
-				adios (NULL, "-%s unknown", cp);
+				adios(NULL, "-%s unknown", cp);
 
 			case HELPSW:
-				snprintf (help, sizeof(help), "%s [switches] [sequences]",
-						  invo_name);
-				print_help (help, switches, 1);
-				done (1);
+				snprintf(help, sizeof(help),
+						"%s [switches] [sequences]",
+						invo_name);
+				print_help(help, switches, 1);
+				done(1);
 			case VERSIONSW:
 				print_version(invo_name);
-				done (1);
+				done(1);
 
 			case FOLDERSSW:
 				if (!(folders = *argp++) || *folders == '-')
-					adios(NULL, "missing argument to %s", argp[-2]);
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
 				continue;
 			case MODESW:
 				if (!(invo_name = *argp++) || *invo_name == '-')
-					adios(NULL, "missing argument to %s", argp[-2]);
-				invo_name = r1bindex(invo_name, '/');
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				invo_name = mhbasename(invo_name);
 				continue;
 			}
 		}
 		/* have a sequence argument */
 		if (!seq_in_list(cp, sequences)) {
 			sequences[i++] = cp;
+			sequences[i] = NULL;
 		}
 	}
 
@@ -468,39 +500,46 @@ main(int argc, char **argv)
 		/* will flists */
 	} else {
 		if (folders[0] != '/') {
-			folders = m_maildir(folders);
+			folders = toabsdir(folders);
 		}
 	}
 
 	if (i == 0) {
+		char *dp;
 		/* no sequence arguments; use unseen */
-		unseen = context_find(usequence);
-		if (unseen == NULL || unseen[0] == '\0') {
-			adios(NULL, "must specify sequences or set %s", usequence);
+		if ((unseen = context_find(usequence))) {
+			if (!*unseen) {
+				adios(NULL, "profile entry %s set, but empty, and no sequences given", usequence);
+			}
+		} else {
+			unseen = seq_unseen;  /* use default */
 		}
-		for (ap = brkstring(unseen, " ", "\n"); *ap; ap++) {
+		dp = getcpy(unseen);
+		for (ap = brkstring(dp, " ", "\n"); *ap; ap++) {
 			sequences[i++] = *ap;
 		}
 	}
 	sequences[i] = NULL;
 
-	folder = doit(context_find(pfolder), folders, sequences);
+	folder = doit(context_find(curfolder), folders, sequences);
 	if (folder == NULL) {
 		done(0);
 		return 1;
 	}
 
 	if (run_mode == UNSEEN) {
-		/* All the scan(1)s it runs change the current folder, so we
-		 * need to put it back.  Unfortunately, context_replace lamely
-		 * ignores the new value you give it if it is the same one it
-		 * has in memory.  So, we'll be lame, too.  I'm not sure if i
-		 * should just change context_replace... */
-		context_replace(pfolder, "defeat_context_replace_optimization");
+		/*
+		** All the scan(1)s it runs change the current folder, so we
+		** need to put it back.  Unfortunately, context_replace lamely
+		** ignores the new value you give it if it is the same one it
+		** has in memory.  So, we'll be lame, too.  I'm not sure if i
+		** should just change context_replace...
+		*/
+		context_replace(curfolder, "defeat_context_replace_optimization");
 	}
 
 	/* update current folder */
-	context_replace(pfolder, folder->n_name);
+	context_replace(curfolder, folder->n_name);
 
 	if (run_mode == FNEXT || run_mode == FPREV) {
 		printf("%s  %s\n", folder->n_name, folder->n_field);
@@ -508,6 +547,6 @@ main(int argc, char **argv)
 
 	context_save();
 
-	done (0);
+	done(0);
 	return 1;
 }