X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fanno.c;h=e97afbf8d83b19b46fb16ac422bf402938b2f99f;hp=8967961459632afb865d53e29b35d51df6a8bad6;hb=88a0787554de9c618e657c31940e734178a25730;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/anno.c b/uip/anno.c
index 8967961..e97afbf 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -45,31 +45,27 @@
 static struct swit switches[] = {
 #define COMPSW 0
 	{ "component field", 0 },
-#define INPLSW 1
-	{ "inplace", 0 },
-#define NINPLSW 2
-	{ "noinplace", 0 },
-#define DATESW 3
+#define DATESW 1
 	{ "date", 0 },
-#define NDATESW 4
+#define NDATESW 2
 	{ "nodate", 0 },
-#define TEXTSW 5
+#define TEXTSW 3
 	{ "text body", 0 },
-#define VERSIONSW 6
+#define VERSIONSW 4
 	{ "version", 0 },
-#define HELPSW 7
+#define HELPSW 5
 	{ "help", 0 },
-#define LISTSW 8
+#define LISTSW 6
 	{ "list", 1 },
-#define DELETESW 9
+#define DELETESW 7
 	{ "delete", 2 },
-#define NUMBERSW 10
+#define NUMBERSW 8
 	{ "number", 2 },
-#define APPENDSW 11
+#define APPENDSW 9
 	{ "append", 1 },
-#define PRESERVESW 12
+#define PRESERVESW 10
 	{ "preserve", 1 },
-#define NOPRESERVESW 13
+#define NOPRESERVESW 11
 	{ "nopreserve", 3 },
 	{ NULL, 0 }
 };
@@ -77,13 +73,14 @@ static struct swit switches[] = {
 /*
 ** static prototypes
 */
-static void make_comp (unsigned char **);
+static void make_comp(unsigned char **);
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
-	int inplace = 1, datesw = 1;
+	int datesw = 1;
+	int preserve = 0;
 	int msgnum;
 	char *cp, *maildir;
 	unsigned char *comp = NULL;
@@ -99,140 +96,129 @@ main (int argc, char **argv)
 #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;
 
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
-			switch (smatch (++cp, switches)) {
-				case AMBIGSW:
-					ambigsw (cp, switches);
-					done (1);
-				case UNKWNSW:
-					adios (NULL, "-%s unknown", cp);
-
-				case HELPSW:
-					snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
-						invo_name);
-					print_help (buf, switches, 1);
-					done (1);
-				case VERSIONSW:
-					print_version(invo_name);
-					done (1);
-
-				case COMPSW:
-					if (comp)
-						adios (NULL, "only one component at a time!");
-					if (!(comp = *argp++) || *comp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					continue;
-
-				case DATESW:
-					datesw++;
-					continue;
-				case NDATESW:
-					datesw = 0;
-					continue;
-
-				case INPLSW:
-					inplace++;
-					continue;
-				case NINPLSW:
-					inplace = 0;
-					continue;
-
-				case TEXTSW:
-					if (text)
-						adios (NULL, "only one body at a time!");
-					if (!(text = *argp++) || *text == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					continue;
-
-				case DELETESW:  /* delete annotations */
-					delete = 0;
-					continue;
-
-				case LISTSW:  /* produce a listing */
-					list = 1;
-					continue;
-
-				case NUMBERSW:  /* number listing or delete by number */
-					if (number != 0)
-						adios (NULL, "only one number at a time!");
-
-					if (argp - arguments == argc - 1 || **argp == '-')
-						number = 1;
-
-					else {
-							if (strcmp(*argp, "all") == 0)
-								number = -1;
-
-							else if (!(number = atoi(*argp)))
-							adios (NULL, "missing argument to %s", argp[-2]);
-
-						argp++;
-					}
-
-					delete = number;
-					continue;
-
-				case APPENDSW:  /* append annotations instead of default prepend */
-					append = 1;
-					continue;
-
-				case PRESERVESW:  /* preserve access and modification times on annotated message */
-					annopreserve(1);
-					continue;
-
-				case NOPRESERVESW:  /* don't preserve access and modification times on annotated message (default) */
-					annopreserve(0);
-					continue;
+			switch (smatch(++cp, switches)) {
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				done(1);
+			case UNKWNSW:
+				adios(NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf),
+					"%s [+folder] [msgs] [switches]",
+					invo_name);
+				print_help(buf, switches, 1);
+				done(1);
+			case VERSIONSW:
+				print_version(invo_name);
+				done(1);
+
+			case COMPSW:
+				if (comp)
+					adios(NULL, "only one component at a time!");
+				if (!(comp = *argp++) || *comp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+
+			case DATESW:
+				datesw++;
+				continue;
+			case NDATESW:
+				datesw = 0;
+				continue;
+
+			case TEXTSW:
+				if (text)
+					adios(NULL, "only one body at a time!");
+				if (!(text = *argp++) || *text == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+
+			case DELETESW:  /* delete annotations */
+				delete = 0;
+				continue;
+
+			case LISTSW:  /* produce a listing */
+				list = 1;
+				continue;
+
+			case NUMBERSW: /* number listing or delete by number */
+				if (number != 0)
+					adios(NULL, "only one number at a time!");
+
+				if (argp-arguments == argc-1 || **argp == '-')
+					number = 1;
+
+				else {
+						if (strcmp(*argp, "all") == 0)
+							number = -1;
+
+						else if (!(number = atoi(*argp)))
+						adios(NULL, "missing argument to %s", argp[-2]);
+
+					argp++;
+				}
+
+				delete = number;
+				continue;
+
+			case APPENDSW:  /* append annotations instead of default prepend */
+				append = 1;
+				continue;
+
+			case PRESERVESW:  /* preserve access and modification times on annotated message */
+				preserve = 1;
+				continue;
+
+			case NOPRESERVESW:  /* don't preserve access and modification times on annotated message (default) */
+				preserve = 0;
+				continue;
 			}
 		}
 		if (*cp == '+' || *cp == '@') {
 			if (folder)
-				adios (NULL, "only one folder at a time!");
+				adios(NULL, "only one folder at a time!");
 			else
-				folder = pluspath (cp);
+				folder = getcpy(expandfol(cp));
 		} else
 			app_msgarg(&msgs, cp);
 	}
 
-#ifdef UCI
-	if (strcmp(invo_name, "fanno") == 0)  /* ugh! */
-		datesw = 0;
-#endif /* UCI */
-
-	if (!context_find ("path"))
-		free (path ("./", TFOLDER));
 	if (!msgs.size)
-		app_msgarg(&msgs, "cur");
+		app_msgarg(&msgs, seq_cur);
 	if (!folder)
-		folder = getfolder (1);
-	maildir = m_maildir (folder);
+		folder = getcurfol();
+	maildir = toabsdir(folder);
 
-	if (chdir (maildir) == NOTOK)
-		adios (maildir, "unable to change directory to");
+	if (chdir(maildir) == NOTOK)
+		adios(maildir, "unable to change directory to");
 
 	/* read folder and create message structure */
-	if (!(mp = folder_read (folder)))
-		adios (NULL, "unable to read folder %s", folder);
+	if (!(mp = folder_read(folder)))
+		adios(NULL, "unable to read folder %s", folder);
 
 	/* check for empty folder */
 	if (mp->nummsg == 0)
-		adios (NULL, "no messages in %s", folder);
+		adios(NULL, "no messages in %s", folder);
 
 	/* parse all the message ranges/sequences and set SELECTED */
 	for (msgnum = 0; msgnum < msgs.size; msgnum++)
-		if (!m_convert (mp, msgs.msgs[msgnum]))
-			done (1);
+		if (!m_convert(mp, msgs.msgs[msgnum]))
+			done(1);
 
-	make_comp (&comp);
+	make_comp(&comp);
 
 	/* annotate all the SELECTED messages */
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@ -240,44 +226,44 @@ main (int argc, char **argv)
 			if (list)
 				annolist(m_name(msgnum), comp, text, number);
 			else
-				annotate (m_name (msgnum), comp, text, inplace, datesw, delete, append);
+				annotate(m_name(msgnum), comp, text, datesw, delete, append, preserve);
 		}
 	}
 
-	context_replace (pfolder, folder);  /* update current folder  */
-	seq_setcur (mp, mp->lowsel);  /* update current message */
-	seq_save (mp);  /* synchronize message sequences */
-	folder_free (mp);  /* free folder/message structure */
-	context_save ();  /* save the context file */
-	done (0);
+	context_replace(curfolder, folder);  /* update current folder  */
+	seq_setcur(mp, mp->lowsel);  /* update current message */
+	seq_save(mp);  /* synchronize message sequences */
+	folder_free(mp);  /* free folder/message structure */
+	context_save();  /* save the context file */
+	done(0);
 	return 1;
 }
 
 static void
-make_comp (unsigned char **ap)
+make_comp(unsigned char **ap)
 {
 	register unsigned char *cp;
 	char buffer[BUFSIZ];
 
 	if (*ap == NULL) {
-		printf ("Enter component name: ");
-		fflush (stdout);
+		printf("Enter component name: ");
+		fflush(stdout);
 
-		if (fgets (buffer, sizeof buffer, stdin) == NULL)
-			done (1);
-		*ap = trimcpy (buffer);
+		if (fgets(buffer, sizeof buffer, stdin) == NULL)
+			done(1);
+		*ap = trimcpy(buffer);
 	}
 
-	if ((cp = *ap + strlen (*ap) - 1) > *ap && *cp == ':')
+	if ((cp = *ap + strlen(*ap) - 1) > *ap && *cp == ':')
 		*cp = 0;
-	if (strlen (*ap) == 0)
-		adios (NULL, "null component name");
+	if (strlen(*ap) == 0)
+		adios(NULL, "null component name");
 	if (**ap == '-')
-		adios (NULL, "invalid component name %s", *ap);
-	if (strlen (*ap) >= NAMESZ)
-		adios (NULL, "too large component name %s", *ap);
+		adios(NULL, "invalid component name %s", *ap);
+	if (strlen(*ap) >= NAMESZ)
+		adios(NULL, "too large component name %s", *ap);
 
 	for (cp = *ap; *cp; cp++)
-		if (!isalnum (*cp) && *cp != '-')
-			adios (NULL, "invalid component name %s", *ap);
+		if (!isalnum(*cp) && *cp != '-')
+			adios(NULL, "invalid component name %s", *ap);
 }