attempt to De-Athenify

[unix-history] / usr / src / old / vpr / vpq.c

diff --git a/usr/src/old/vpr/vpq.c b/usr/src/old/vpr/vpq.c
index 3e9a580..87c4154 100644 (file)
--- a/usr/src/old/vpr/vpq.c
+++ b/usr/src/old/vpr/vpq.c
@@ -1,19 +1,19 @@
-/*
+/* vpq.c               %G%

  * Varian and Versatec queue
  */
 
  * Varian and Versatec queue
  */
 

-#include <sys/types.h>
-#include <dir.h>
-#include <stat.h>
+static char vpqSCCSid[] = "@(#)vpq.c   1.4\t%G%";
+
+#include <sys/param.h>
+#include <sys/dir.h>
+#include <sys/stat.h>

 #include <stdio.h>
 #include <errno.h>
 #define        MAXJOBS 100
 
 #include <stdio.h>
 #include <errno.h>
 #define        MAXJOBS 100
 

-struct dir dirent;

 struct stat stbuf;
 int    nextflag;
 int    linecnt;
 struct stat stbuf;
 int    nextflag;
 int    linecnt;

-FILE   *df;

 FILE   *jf;
 char   line[100];
 char   username[10];
 FILE   *jf;
 char   line[100];
 char   username[10];


@@ -62,6 +62,8 @@ queue(device, devname, spooldir, daemon)
 char *device, *devname, *spooldir, *daemon;
 {
        FILE *vc;
 char *device, *devname, *spooldir, *daemon;
 {
        FILE *vc;

+       DIR *df;
+       register struct direct *dirp;

 
        printf("%s: ", devname);
        vc = fopen(device, "w");
 
        printf("%s: ", devname);
        vc = fopen(device, "w");


@@ -82,39 +84,36 @@ char *device, *devname, *spooldir, *daemon;
                perror(spooldir);
                return;
        }
                perror(spooldir);
                return;
        }

-oloop:
-       df = fopen(".", "r");
+       df = opendir(".");

        if (df == NULL) {
                perror(spooldir);
                return;
        }
        if (df == NULL) {
                perror(spooldir);
                return;
        }

-loop:
-       fseek(df, 0l, 0);

        linecnt = 0;
        cnt = 0;
        linecnt = 0;
        cnt = 0;

-       while (fread(&dirent, sizeof dirent, 1, df) == 1) {
-               if (dirent.d_ino == 0)
-                       continue;
-               if (dirent.d_name[0] != 'd')
+       while ((dirp = readdir(df)) != NULL) {
+               if (dirp->d_name[0] != 'd')

                        continue;
                        continue;

-               if (dirent.d_name[1] != 'f')
+               if (dirp->d_name[1] != 'f')

                        continue;
                        continue;

-               if (stat(dirent.d_name, &stbuf) < 0)
+               if (stat(dirp->d_name, &stbuf) < 0)

                        continue;
                if (cnt == 0)
                        printf("Owner\t  Id      Chars  Filename\n");
                cnt++;
                        continue;
                if (cnt == 0)
                        printf("Owner\t  Id      Chars  Filename\n");
                cnt++;

-               process();
+               process(dirp);

        }
        }

+       closedir(df);

        if (cnt == 0)
                printf("Queue is empty.\n");
        printf("\n");
 }
 
        if (cnt == 0)
                printf("Queue is empty.\n");
        printf("\n");
 }
 

-process()
+process(dirp)
+       register struct direct *dirp;

 {
 
 {
 

-       jf = fopen(dirent.d_name, "r");
+       jf = fopen(dirp->d_name, "r");

        if (jf == NULL)
                return;
        while (getline()) {
        if (jf == NULL)
                return;
        while (getline()) {


@@ -124,15 +123,16 @@ process()
                        strcpy(username, line+1);
                        break;
 
                        strcpy(username, line+1);
                        break;
 

-               case 'B':
+               case 'C':
+               case 'V':

                case 'F':
                case 'G':
                case 'P':
                case 'T':
                        if (stat(line+1, &stbuf) < 0)
                                stbuf.st_size = 0;
                case 'F':
                case 'G':
                case 'P':
                case 'T':
                        if (stat(line+1, &stbuf) < 0)
                                stbuf.st_size = 0;

-                       printf("%-10s%5s%8d  %s\n", username, dirent.d_name+3,
-                           stbuf.st_size, line+1);
+                       printf("%-10s%5s%8d  %s\n", username,
+                           &(dirp->d_name[3]), stbuf.st_size, line+1);

                        break;
                }
        }
                        break;
                }
        }