WebSVN – SvarDOS – Diff – /svarcom/trunk/cmd/dir.c

 static void dir_print_dirof(const char *p, unsigned short *availrows, unsigned char pagination) {
   unsigned char t, lastbkslash;
   char buff[2] = {0, 0};
   const char *dirof = svarlang_str(37,20); /* Directory of % */
+  outputnl("");
+  if (pagination) dir_pagination(availrows);
   /* print string until % */
   while ((*dirof != 0) && (*dirof != '%')) {
     *buff = *dirof;
     output(buff);
     dirof++;
     nls_outputnl(37,9); /* "    D by date                G group dirs first       - prefix to reverse order" */
     outputnl("");
     nls_outputnl(37,10); /* "/S Displays files in specified directory and all subdirectories" */
     nls_outputnl(37,11); /* "/B Uses bare format (no heading information or summary)" */
     nls_outputnl(37,12); /* "/L Uses lowercases" */
-    goto OK;
+    goto GAMEOVER;
+  }
   /* allocate buf */
   buf = calloc(sizeof(*buf), 1);
   if (buf == NULL) {
     nls_output_err(255, 8); /* insufficient memory */
-    goto FAIL;
+    goto GAMEOVER;
+  }
   /* zero out glob_sortcmp_dat and init the collation table */
   bzero(&glob_sortcmp_dat, sizeof(glob_sortcmp_dat));
   for (i = 0; i < 256; i++) {
     cmd_explode(buf->buff64, dircmd, argvptrs);
     if ((dir_parse_cmdline(&req, argvptrs) != 0) || (req.filespecptr != NULL)) {
       nls_output(255, 10);/* bad environment */
       output(" - ");
       outputnl("DIRCMD");
-      goto FAIL;
+      goto GAMEOVER;
+    }
+  }
+  }
   /* parse user's command line */
-  if (dir_parse_cmdline(&req, p->argv) != 0) goto FAIL;
+  if (dir_parse_cmdline(&req, p->argv) != 0) goto GAMEOVER;
   /*** PARSING COMMAND LINE DONE *********************************************/
   /* if no filespec provided, then it's about the current directory */
   if (req.filespecptr == NULL) req.filespecptr = ".";
   } else {
     i = file_truename(req.filespecptr, buf->path);
+  }
   if (i != 0) {
     nls_outputnl_doserr(i);
-    goto FAIL;
+    goto GAMEOVER;
+  }
   /* volume label and serial */
   if (req.format != DIR_OUTPUT_BARE) {
     drv = buf->path[0];
   /* if no file match then abort */
   if (i != 0) {
     if (req.flags & DIR_FLAG_RECUR) goto CHECK_RECURS;
     nls_outputnl_doserr(i);
-    goto FAIL;
+    goto GAMEOVER;
+  }
   /* if sorting is involved, then let's buffer all results (and sort them) */
   if (req.flags & DIR_FLAG_SORT) {
     /* allocate a memory buffer - try several sizes until one succeeds */
+    }
     /* printf("max_dta_bufcount = %u\n", max_dta_bufcount); */
     if (dtabuf == NULL) {
       nls_outputnl_doserr(8); /* out of memory */
-      goto FAIL;
+      goto GAMEOVER;
+    }
     /* remember the address so I can free it afterwards */
     glob_sortcmp_dat.dtabuf_root = dtabuf;
     /* no match? kein gluck! (this can happen when filtering attribs with /A:xxx
      * because while findfirst() succeeds, all entries can be rejected) */
     if (dtabufcount == 0) {
       nls_outputnl_doserr(2); /* "File not found" */
-      goto FAIL;
+      goto GAMEOVER;
+    }
     /* sort the list - the tricky part is that my array is a far address while
      * qsort works only with near pointers, so I have to use an ugly (and
      * global) auxiliary table */
+  }
   /* print out summary (unless bare output mode) */
   if (req.format != DIR_OUTPUT_BARE) {
     dir_print_summary_files(buf->buff64, uint32maxlen, summary_totsz, summary_fcount, &availrows, req.flags, &(buf->nls));
-    /* extra linefeed if /S mode */
-    if (req.flags & DIR_FLAG_RECUR) {
-      outputnl("");
-      dir_pagination(&availrows);
-    }
+  }
   /* update global counters in case /s is used */
   summary_recurs_fcount += summary_fcount;
   summary_recurs_totsz += summary_totsz;
   /* print out disk space available (unless bare output mode) */
   if (req.format != DIR_OUTPUT_BARE) {
     /* if /s mode then print also global stats */
     if (req.flags & DIR_FLAG_RECUR) {
+      if (summary_recurs_fcount == 0) {
+        file_truename(req.filespecptr, buf->path);
+        dir_print_dirof(buf->path, &availrows, req.flags & DIR_FLAG_PAUSE);
+        nls_outputnl_doserr(2); /* "File not found" */
+        goto GAMEOVER;
+      } else {
+        outputnl("");
+        if (req.flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
-      nls_outputnl(37,25); /* Total files listed: */
+        nls_outputnl(37,25); /* Total files listed: */
-      if (req.flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
+        if (req.flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
-      dir_print_summary_files(buf->buff64, uint32maxlen, summary_recurs_totsz, summary_recurs_fcount, &availrows, req.flags, &(buf->nls));
+        dir_print_summary_files(buf->buff64, uint32maxlen, summary_recurs_totsz, summary_recurs_fcount, &availrows, req.flags, &(buf->nls));
+      }
+    }
     /* xxxx bytes free */
     i = cmd_dir_df(&summary_totsz, drv);
     if (i != 0) nls_outputnl_doserr(i);
     memset(buf->buff64, ' ', summary_alignpos + 8 + uint32maxlen); /* align the freebytes value to same column as totbytes */
     output(" ");
     nls_outputnl(37,24); /* "bytes free" */
     if (req.flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
+  }
+  GAMEOVER:
   /* free the buffer memory (if used) */
   if (glob_sortcmp_dat.dtabuf_root != NULL) _ffree(glob_sortcmp_dat.dtabuf_root);
-  FAIL:
-  free(buf);
-  return(CMD_FAIL);
-  OK:
   free(buf);
   return(CMD_OK);
+}

Subversion Repositories SvarDOS

(root)/svarcom/trunk/cmd/dir.c – Rev 2204 → 2205