Correct offsets for both versions of gsnt.

[moira.git] / regtape / vote.pc

diff --git a/regtape/vote.pc b/regtape/vote.pc
index 90b71fa32af70580ee0baabdb02cce54dbb66dc5..a66b983ec872fad54455e63a25da0ae0828d5d4f 100644 (file)
--- a/regtape/vote.pc
+++ b/regtape/vote.pc
@@ -1,127 +1,134 @@
-/* $Header$
+/* $Id$
+ *
+ * Copyright (C) 1993-1998 by the Massachusetts Institute of Technology
+ * For copying and distribution information, please see the file
+ * <mit-copyright.h>.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/time.h>
+#include <mit-copyright.h>
 #include <moira.h>
 #include <moira_site.h>
+
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+
 EXEC SQL INCLUDE sqlca;
 
+RCSID("$Header$");
 
 struct entry {
-    char *line;
-    char id[19];
-    char login[9];
+  char *line;
+  char id[19];
+  char login[9];
 };
 
 char *whoami;
 int debug;
 
+struct entry *get_next_entry(FILE *in);
+int process_entry(struct entry *e);
 
-main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
 {
-    FILE *in;
-    struct entry *e, *get_next_entry();
-    int i, wait = 0;
-    char buf[BUFSIZ], *file = NULL, *p, *p1, *db="moira";
-
-    debug = 0;
-    whoami = strrchr(argv[0], '/');
-    if (whoami)
-      whoami++;
-    else
-      whoami = argv[0];
-
-    setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
-    setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
-
-    for (i = 1; i < argc; i++) {
-       if (!strcmp(argv[i], "-w"))
-         wait++;
-       else if (!strcmp(argv[i], "-D"))
-         setenv("ING_SET", "set printqry");
-       else if (!strcmp(argv[i], "-d"))
-         debug = 1;
-       else if (file != NULL)
-         fprintf(stderr, "Usage: %s [-w] [-D] [-n] inputfile\n", whoami);
-       else
-         file = argv[i];
+  FILE *in;
+  struct entry *e;
+  int i, wait = 0;
+  char buf[BUFSIZ], *file = NULL, *p, *p1, *db = "moira";
+
+  debug = 0;
+  whoami = strrchr(argv[0], '/');
+  if (whoami)
+    whoami++;
+  else
+    whoami = argv[0];
+
+  setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
+  setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
+
+  for (i = 1; i < argc; i++)
+    {
+      if (!strcmp(argv[i], "-w"))
+       wait++;
+      else if (!strcmp(argv[i], "-d"))
+       debug = 1;
+      else if (file)
+       fprintf(stderr, "Usage: %s [-w] [-D] [-n] inputfile\n", whoami);
+      else
+       file = argv[i];
     }
 
-    in = fopen(file, "r");
-    if (in == NULL) {
-       fprintf(stderr, "Unable to open %s for input\n", file);
-       exit(1);
+  in = fopen(file, "r");
+  if (!in)
+    {
+      fprintf(stderr, "Unable to open %s for input\n", file);
+      exit(1);
     }
 
-    EXEC SQL CONNECT :db IDENTIFIED BY :db;
-    if (sqlca.sqlcode != 0) {
-       com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
-       exit(1);
+  EXEC SQL CONNECT :db IDENTIFIED BY :db;
+  if (sqlca.sqlcode)
+    {
+      com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
+      exit(1);
     }
 
-    while (e = get_next_entry(in)) {
-       i = process_entry(e);
-       EXEC SQL COMMIT WORK;
-       if (i == 0) {
-           p = &(e->line[0]);
-           for (p1 = e->login; *p1; p1++)
-             *p++ = *p1;
-           for (; p < &(e->line[10]); p++)
-             *p = ' ';
-           fputs(e->line, stdout);
+  while ((e = get_next_entry(in)))
+    {
+      i = process_entry(e);
+      EXEC SQL COMMIT WORK;
+      if (i == 0)
+       {
+         p = &(e->line[0]);
+         for (p1 = e->login; *p1; p1++)
+           *p++ = *p1;
+         for (; p < &(e->line[10]); p++)
+           *p = ' ';
+         fputs(e->line, stdout);
        }
-       if (wait) {
-           printf("Next");
-           fflush(stdout);
-           gets(buf);
+      if (wait)
+       {
+         printf("Next");
+         fflush(stdout);
+         gets(buf);
        }
     }
 
-    exit(0);
+  exit(0);
 }
 
-
-
-struct entry *get_next_entry(in)
-FILE *in;
+struct entry *get_next_entry(FILE *in)
 {
-    static struct entry e;
-    static char buf[BUFSIZ];
+  static struct entry e;
+  static char buf[BUFSIZ];
 
-    if (fgets(buf, sizeof(buf), in) == NULL)
-      return((struct entry *)NULL);
+  if (!fgets(buf, sizeof(buf), in))
+    return NULL;
 
-    e.line = &buf[0];
-    strncpy(e.id, &buf[0], 9);
-    e.id[9] = 0;
-    e.login[0] = 0;
-    return(&e);
+  e.line = &buf[0];
+  strncpy(e.id, &buf[0], 9);
+  e.id[9] = '\0';
+  e.login[0] = '\0';
+  return &e;
 }
 
-
-process_entry(e)
-struct entry *e;
+int process_entry(struct entry *e)
 {
-    EXEC SQL BEGIN DECLARE SECTION;
-    char *id, *login;
-    EXEC SQL VAR login is STRING(9);
-    EXEC SQL END DECLARE SECTION;
-
-    id = e->id;
-    login = e->login;
-    EXEC SQL SELECT login INTO :login FROM users WHERE clearid = :id;
-    if (sqlca.sqlcode != 0) {
-       fprintf(stderr, "Error %d on %s\n", sqlca.sqlcode, e->line);
-       return(-1);
+  EXEC SQL BEGIN DECLARE SECTION;
+  char *id, *login;
+  EXEC SQL VAR login is STRING(9);
+  EXEC SQL END DECLARE SECTION;
+
+  id = e->id;
+  login = e->login;
+  EXEC SQL SELECT login INTO :login FROM users WHERE clearid = :id;
+  if (sqlca.sqlcode)
+    {
+      fprintf(stderr, "Error %ld on %s\n", sqlca.sqlcode, e->line);
+      return -1;
     }
-    strncpy(e->login, login, 8);
-    e->login[8] = 0;
-    if (debug)
-      printf("Got username %s\n", login);
-    return(0);
+  strncpy(e->login, login, 8);
+  e->login[8] = 0;
+  if (debug)
+    printf("Got username %s\n", login);
+  return 0;
 }