X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fseq_nameok.c;h=54d63eed641bac4d874ced7360c3b8ca95214ff7;hp=e9598c062c0a88244085b0c57d0fe2aee55373ff;hb=18591f8e001ecedbee48a51c1d1f08ebaa1c15c8;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/sbr/seq_nameok.c b/sbr/seq_nameok.c
index e9598c0..54d63ee 100644
--- a/sbr/seq_nameok.c
+++ b/sbr/seq_nameok.c
@@ -1,5 +1,5 @@
 /*
-** seq_nameok.c -- check if a sequence name is ok
+** seq_nameok.c -- check if a name is ok for a user-defined sequence
 **
 ** This code is Copyright (c) 2002, by the authors of nmh.  See the
 ** COPYRIGHT file in the root directory of the nmh distribution for
@@ -7,29 +7,31 @@
 */
 
 #include <h/mh.h>
+#include <ctype.h>
 
 
+/*
+** returns true if it is a valid name for a user-defined sequence
+*/
 int
-seq_nameok (unsigned char *s)
+seq_nameok(unsigned char *s)
 {
 	unsigned char *pp;
 
 	if (s == NULL || *s == '\0') {
-		advise (NULL, "empty sequence name");
+		advise(NULL, "empty sequence name");
 		return 0;
 	}
 
 	/*
 	** Make sure sequence name doesn't clash with one
 	** of the `reserved' sequence names.
+	** Note: Accept `cur' here! But why is it treated special? --meillo
 	*/
-	if (!(strcmp (s, "new") &&
-		  strcmp (s, "all") &&
-		  strcmp (s, "first") &&
-		  strcmp (s, "last") &&
-		  strcmp (s, "prev") &&
-		  strcmp (s, "next"))) {
-		advise (NULL, "illegal sequence name: %s", s);
+	if (strcmp(s, seq_first)==0 || strcmp(s, seq_last)==0 ||
+			strcmp(s, seq_prev)==0 || strcmp(s, seq_next)==0 ||
+			strcmp(s, seq_all)==0 || strcmp(s, seq_beyond)==0) {
+		advise(NULL, "collision with reserved sequence name: `%s'", s);
 		return 0;
 	}
 
@@ -37,19 +39,21 @@ seq_nameok (unsigned char *s)
 	** First character in a sequence name must be
 	** an alphabetic character ...
 	*/
-	if (!isalpha (*s)) {
-		advise (NULL, "illegal sequence name: %s", s);
+	if (!isalpha(*s)) {
+		advise(NULL, "sequence name must start with a letter: %s", s);
 		return 0;
 	}
 
 	/*
 	** and can be followed by zero or more alphanumeric characters
 	*/
-	for (pp = s + 1; *pp; pp++)
-		if (!isalnum (*pp)) {
-			advise (NULL, "illegal sequence name: %s", s);
+	for (pp = s+1; *pp; pp++) {
+		if (!isalnum(*pp)) {
+			advise(NULL, "sequence name must only contain "
+					"letters and digits: %s", s);
 			return 0;
 		}
+	}
 
 	return 1;
 }