Changeset 4276 for trunk/athena/bin/lpr/quota/bill_db.c

Timestamp:

01/23/91 08:28:04 (19 years ago)

Author:

epeisach

Message:

ATHCODE changed.
Better error messages.
Will compile if -DDEBUG is used.

Files:

• trunk/athena/bin/lpr/quota/bill_db.c (modified) (5 diffs)

trunk/athena/bin/lpr/quota/bill_db.c

@@ -14 +14 @@
 #include "quota.h"
 
+/* These have to be defined here because quota_dba.o declares them */
+/* extern.   Normally, the are declared in qmain.c. */
+#ifdef DEBUG
+char *progname = "bill_db";
+int quota_debug=1;
+#endif
+
 /* Define all codes that that the bursar files will use. */
 #define STUFF "SU1"
-#define ATHCODE "385"
+#define ATHCODE "721"
 #define TITLE "Printing: "
-#define TITLE1 "Printing Charges"
+#define TITLE1 "Athena Printing Charges"
 #define ACC "24745"
 #define OBJ "480"
@@ -28 +35 @@
 
 int clean1=0, clean2=0, clean3=0;
+extern int errno;
 
 FILE *fp, *fp2, *fp3;
@@ -77 +85 @@
   if (kresult != KSUCCESS)
     fprintf(stderr, "bill_db: error in obtaining realm\n");
-  else if (!(name_list = read_name_list(argv[1])))
+  else if (!(name_list = read_name_list(argv[1])) && errno)
     fprintf(stderr, "error in reading name list file %s\n", argv[1]);
   else if (quota_db_set_name(argv[2]))
@@ -129 +137 @@
   current = new = name_list = (struct person *)NULL;
 
+  errno = ENOENT;
   if(!(fp = fopen(argv, "r"))) return NULL;
+  errno = 0;
   while (fscanf(fp, "%[^:]:%d:%c:%[^\n]\n", user_name, &number, 
                 &flag, real_name) != EOF) {
@@ -154 +164 @@
   (void)fclose(fp);
   if (trip == 0)
-    return(NULL);
+    return((struct person *)NULL);
   return(name_list);
 }