X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frcvpack.c;h=f9687d8fa56e07aa3a3653570f5dee360935b19a;hb=a7771fd2e83d64228fb675749fc936151249dbd3;hp=b1bc518e1c14e7e6de96e39127e8a70282e32da4;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1;p=mmh

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index b1bc518..f9687d8 100644
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -1,10 +1,10 @@
 /*
- * rcvpack.c -- append message to a file
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** rcvpack.c -- append message to a file
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 #include <h/dropsbr.h>
@@ -25,13 +25,13 @@ static struct swit switches[] = {
 };
 
 /*
- * default format in which to save messages
- */
+** default format in which to save messages
+*/
 static int mbx_style = MBOX_FORMAT;
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	int md;
 	char *cp, *file = NULL, buf[BUFSIZ];
@@ -40,66 +40,70 @@ 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();
 
-	mts_init (invo_name);
-	arguments = getarguments (invo_name, argc, argv, 1);
+	mts_init(invo_name);
+	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
 	/* parse 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 [switches] file", invo_name);
-					print_help (buf, switches, 1);
-					done (1);
-				case VERSIONSW:
-					print_version(invo_name);
-					done (1);
-
-				case MBOXSW:
-					mbx_style = MBOX_FORMAT;
-					continue;
-				case MMDFSW:
-					mbx_style = MMDF_FORMAT;
-					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 [switches] file",
+						invo_name);
+				print_help(buf, switches, 1);
+				done(1);
+			case VERSIONSW:
+				print_version(invo_name);
+				done(1);
+
+			case MBOXSW:
+				mbx_style = MBOX_FORMAT;
+				continue;
+			case MMDFSW:
+				mbx_style = MMDF_FORMAT;
+				continue;
 			}
 		}
 		if (file)
-			adios (NULL, "only one file at a time!");
+			adios(NULL, "only one file at a time!");
 		else
 			file = cp;
 	}
 
 	if (!file)
-		adios (NULL, "%s [switches] file", invo_name);
+		adios(NULL, "%s [switches] file", invo_name);
 
-	rewind (stdin);
+	rewind(stdin);
 
 	/* open and lock the file */
-	if ((md = mbx_open (file, mbx_style, getuid(), getgid(), m_gmprot())) == NOTOK)
-		done (RCV_MBX);
+	if ((md = mbx_open(file, mbx_style, getuid(), getgid(), m_gmprot()))
+			== NOTOK)
+		done(RCV_MBX);
 
 	/* append the message */
-	if (mbx_copy (file, mbx_style, md, fileno(stdin), 1, NULL, 0) == NOTOK) {
-		mbx_close (file, md);
-		done (RCV_MBX);
+	if (mbx_copy(file, mbx_style, md, fileno(stdin), 1, NULL, 0)
+			== NOTOK) {
+		mbx_close(file, md);
+		done(RCV_MBX);
 	}
 
 	/* close and unlock the file */
-	if (mbx_close (file, md) == NOTOK)
-		done (RCV_MBX);
+	if (mbx_close(file, md) == NOTOK)
+		done(RCV_MBX);
 
-	done (RCV_MOK);
+	done(RCV_MOK);
 	return 1;
 }