X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmsgchk.c;h=36edccb4e0499457907b766f6273bad6a35db456;hb=556e1267b7be84fd25c2d52aa754d623889d52ac;hp=ffde2b49ea07c29a9bf72838a403ed2463efd04f;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/msgchk.c b/uip/msgchk.c
index ffde2b4..36edccb 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -68,7 +68,7 @@ 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();
@@ -83,37 +83,39 @@ main(int argc, char **argv)
 	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] [users ...]", invo_name);
-					print_help(buf, switches, 1);
-					done(1);
-				case VERSIONSW:
-					print_version(invo_name);
-					done(1);
-
-				case DATESW:
-					datesw++;
-					continue;
-				case NDATESW:
-					datesw = 0;
-					continue;
-
-				case NOTESW:
-					if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					notifysw |= donote(cp, 1);
-					continue;
-				case NNOTESW:
-					if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					notifysw &= ~donote(cp, 0);
-					continue;
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				done(1);
+			case UNKWNSW:
+				adios(NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf), "%s [switches] [users ...]", invo_name);
+				print_help(buf, switches, 1);
+				done(1);
+			case VERSIONSW:
+				print_version(invo_name);
+				done(1);
+
+			case DATESW:
+				datesw++;
+				continue;
+			case NDATESW:
+				datesw = 0;
+				continue;
+
+			case NOTESW:
+				if (!(cp = *argp++) || *cp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				notifysw |= donote(cp, 1);
+				continue;
+			case NNOTESW:
+				if (!(cp = *argp++) || *cp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				notifysw &= ~donote(cp, 0);
+				continue;
 			}
 		}
 		if (vecp >= MAXVEC-1)
@@ -167,19 +169,18 @@ static int
 donote(char *cp, int ntflag)
 {
 	switch (smatch(cp, ntswitches)) {
-		case AMBIGSW:
-			ambigsw(cp, ntswitches);
-			done(1);
-		case UNKWNSW:
-			adios(NULL, "-%snotify %s unknown",
-					ntflag ? "" : "no", cp);
-
-		case NALLSW:
-			return NT_ALL;
-		case NMAISW:
-			return NT_MAIL;
-		case NNMAISW:
-			return NT_NMAI;
+	case AMBIGSW:
+		ambigsw(cp, ntswitches);
+		done(1);
+	case UNKWNSW:
+		adios(NULL, "-%snotify %s unknown", ntflag ? "" : "no", cp);
+
+	case NALLSW:
+		return NT_ALL;
+	case NMAISW:
+		return NT_MAIL;
+	case NNMAISW:
+		return NT_NMAI;
 	}
 
 	/* Before 1999-07-15, garbage was returned if control got here. */