--- joko/Uni/BSArch/01/prime.c	2006/05/12 23:27:11	1.7
+++ joko/Uni/BSArch/01/prime.c	2006/05/13 12:06:38	1.10
@@ -1,8 +1,9 @@
-/* $Id: prime.c,v 1.7 2006/05/12 23:27:11 joko Exp $ */
+/* $Id: prime.c,v 1.10 2006/05/13 12:06:38 joko Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <errno.h>
 
 #define BOOL int
 #define TRUE 1
@@ -10,13 +11,14 @@
 
 #define PRINTPRIME(x) if (is_prime(x)) printf("%i\n", x)
 #define PRINTERROR(message) fprintf(stderr, "ERROR: %s\n", message)
+#define PRINTWARNING(message) fprintf(stderr, "WARNING: %s\n", message)
 
 /* check for prime number */
 BOOL is_prime(long int number)
 {
 	int i;
 	
-	/* negative values are never prime numbers */
+	/* negative values, 0 and 1 are never prime numbers */
 	if (number < 2) return FALSE;
 	
 	/* check all numbers 2..sqrt(number) for being a prime number */
@@ -29,13 +31,31 @@
 
 /* convert from string to long int, with error checking */
 long int convert_number(const char *nptr) {
-	long int number = strtol(nptr, (char **)NULL, 10);
-	if (number == LONG_MAX || number == LONG_MIN) {
+	
+	char * endptr;
+	long int number = strtol(nptr, &endptr, 10);
+
+	errno = 0;
+	
+	/* invalid characters? */
+	if (*endptr != '\0') {
 		char message[254];
-		snprintf(message, 255, "Number is not in range of 'long int': %s", nptr);
+		snprintf(message, 256, "Could not convert '%s' to a valid number.", nptr);
 		PRINTERROR(message);
-		exit(-1);
+		exit(EXIT_FAILURE);
 	}
+	
+	/* invalid range? */
+	/* if (number == LONG_MAX || number == LONG_MIN) { */
+	if (errno == ERANGE) {
+		char message[254];
+		snprintf(message, 256, "Number is not in range of 'long int': %s", nptr);
+		PRINTERROR(message);
+		exit(EXIT_FAILURE);
+	}
+	
+	return number;
+	
 }
 
 int main(int argc, char * argv[])
@@ -43,14 +63,15 @@
 	
 	if (argc == 1) {
 		PRINTERROR("No arguments given.");
-		exit(-1);
+		exit(EXIT_FAILURE);
 	}
 	
 	/* (3) range mode */
 	if (argc > 2) {
 		long int i, j;
+		i = convert_number(argv[1]);
 		j = convert_number(argv[2]);
-		for (i = convert_number(argv[1]); i< j; i++) {
+		for (i; i< j; i++) {
 			PRINTPRIME(i);
 		}
 	
@@ -67,9 +88,37 @@
 		
 		/* (2) file mode: read numbers from file */
 		} else {
-			char entry[11];
-			while (fgets(entry, 11, fp)) {
-				long int number = convert_number(entry);
+			char entry[81];
+			long int number;
+			long int lineno = 0;
+			while (fgets(entry, 81, fp)) {
+				
+				/* count line number (for warnings) */
+				lineno++;
+
+				/* skip empty lines */
+				if (strlen(entry) < 2) continue;
+
+				/* line handling: policy = skip exceeding lines */
+				
+				/* if last char is newline, strip it */
+				if (entry[strlen(entry)-1] == '\n') {
+					entry[strlen(entry)-1] = '\0';
+					
+				/* line exceeds max length */
+				} else {
+					char message[254];
+					snprintf(message, 256, "Line too long (max 80 chars) in line number: %i", lineno);
+					PRINTWARNING(message);
+					
+					/* eat all characters until newline */
+					while (fgetc(fp) != 10);
+					
+					/* skip this line from prime calculation */
+					continue;
+				}
+				
+				number = convert_number(entry);
 				PRINTPRIME(number);
 			}
 			fclose(fp);