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

diff --git a/uip/anno.c b/uip/anno.c
index 8967961..b7c1563 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -77,11 +77,11 @@ 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 msgnum;
@@ -99,37 +99,37 @@ 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)) {
+			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 (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
+					snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 						invo_name);
-					print_help (buf, switches, 1);
-					done (1);
+					print_help(buf, switches, 1);
+					done(1);
 				case VERSIONSW:
 					print_version(invo_name);
-					done (1);
+					done(1);
 
 				case COMPSW:
 					if (comp)
-						adios (NULL, "only one component at a time!");
+						adios(NULL, "only one component at a time!");
 					if (!(comp = *argp++) || *comp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					continue;
 
 				case DATESW:
@@ -148,9 +148,9 @@ main (int argc, char **argv)
 
 				case TEXTSW:
 					if (text)
-						adios (NULL, "only one body at a time!");
+						adios(NULL, "only one body at a time!");
 					if (!(text = *argp++) || *text == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					continue;
 
 				case DELETESW:  /* delete annotations */
@@ -163,7 +163,7 @@ main (int argc, char **argv)
 
 				case NUMBERSW:  /* number listing or delete by number */
 					if (number != 0)
-						adios (NULL, "only one number at a time!");
+						adios(NULL, "only one number at a time!");
 
 					if (argp - arguments == argc - 1 || **argp == '-')
 						number = 1;
@@ -173,7 +173,7 @@ main (int argc, char **argv)
 								number = -1;
 
 							else if (!(number = atoi(*argp)))
-							adios (NULL, "missing argument to %s", argp[-2]);
+							adios(NULL, "missing argument to %s", argp[-2]);
 
 						argp++;
 					}
@@ -196,9 +196,9 @@ main (int argc, char **argv)
 		}
 		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 = pluspath(cp);
 		} else
 			app_msgarg(&msgs, cp);
 	}
@@ -208,31 +208,31 @@ main (int argc, char **argv)
 		datesw = 0;
 #endif /* UCI */
 
-	if (!context_find ("path"))
-		free (path ("./", TFOLDER));
+	if (!context_find("path"))
+		free(path("./", TFOLDER));
 	if (!msgs.size)
 		app_msgarg(&msgs, "cur");
 	if (!folder)
-		folder = getfolder (1);
-	maildir = m_maildir (folder);
+		folder = getfolder(1);
+	maildir = m_maildir(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 +240,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, inplace, datesw, delete, append);
 		}
 	}
 
-	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(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);
 	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);
 }