X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fprint_sw.c;h=02d00bc05bc501a2e8db6341f75d094cd51c90d6;hp=dad30d2aebb66d3682c23feeb365e7f9a9705f06;hb=4112940aea5591648b03a81907408752c08b33aa;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1

diff --git a/sbr/print_sw.c b/sbr/print_sw.c
index dad30d2..02d00bc 100644
--- a/sbr/print_sw.c
+++ b/sbr/print_sw.c
@@ -1,31 +1,32 @@
 /*
- * print_sw.c -- print switches
- *
- * 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.
- */
+** print_sw.c -- print switches
+**
+** 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>
 
 
 void
-print_sw (char *substr, struct swit *swp, char *prefix, FILE *fp)
+print_sw(char *substr, struct swit *swp, char *prefix, FILE *fp)
 {
 	int len, optno;
-	register int i;
-	register char *cp, *cp1, *sp;
+	int i;
+	char *cp, *cp1, *sp;
 	char buf[128];
 
 	len = strlen(substr);
 	for (; swp->sw; swp++) {
 		/* null matches all strings */
-		if (!*substr || (ssequal (substr, swp->sw) && len >= swp->minchars)) {
+		if (!*substr || (strncmp(swp->sw, substr, len)==0 &&
+				len >= swp->minchars)) {
 			optno = 0;
 			/* next switch */
 			if ((sp = (&swp[1])->sw)) {
 				if (!*substr && sp[0] == 'n' && sp[1] == 'o' &&
-						strcmp (&sp[2], swp->sw) == 0 && (
+						strcmp(&sp[2], swp->sw) == 0 && (
 						((&swp[1])->minchars == 0 && swp->minchars == 0) ||
 						((&swp[1])->minchars == (swp->minchars) + 2)))
 					optno++;
@@ -35,14 +36,14 @@ print_sw (char *substr, struct swit *swp, char *prefix, FILE *fp)
 				cp = buf;
 				*cp++ = '(';
 				if (optno) {
-					strcpy (cp, "[no]");
-					cp += strlen (cp);
+					strcpy(cp, "[no]");
+					cp += strlen(cp);
 				}
 				for (cp1 = swp->sw, i = 0; i < swp->minchars; i++)
 					*cp++ = *cp1++;
 				*cp++ = ')';
 				while ((*cp++ = *cp1++));
-				fprintf (fp, "  %s%s\n", prefix, buf);
+				fprintf(fp, "  %s%s\n", prefix, buf);
 			} else {
 				if (!swp->minchars)
 					fprintf(fp, optno ? "  %s[no]%s\n" : "  %s%s\n",