WebSVN – SvarDOS – Diff – //tree/trunk/tree.c

    May display N too many lines before pause if line is
    printed that exceeds cols [N=linelen%cols] and lacks
    any newlines (but this should not occur in tree).
 */
 #include <stdarg.h>  /* va_list, va_start, va_end */
-int pprintf(const char *msg, ...)
+static int pprintf(const char *msg, ...) {
-{
   static int lineCnt = -1;
   static int lineCol = 0;
   va_list argptr;
   int cnt;
   char buffer[MAXBUF];
   return cnt;
+}
 /* Displays to user valid options then exits program indicating no error */
-void showUsage(void)
+static void showUsage(void) {
-{
   printf("%s%s%s%s", treeDescription, newLine, treeUsage, newLine);
   printf("%s%s%s", treeFOption, treeAOption, newLine);
   exit(1);
+}
 /* Displays error message then exits indicating error */
-void showInvalidUsage(char * badOption)
+static void showInvalidUsage(char * badOption) {
-{
   printf(invalidOption, badOption);
   printf("%s%s", useTreeHelp, newLine);
   exit(1);
+}
 /* Displays author, copyright, etc info, then exits indicating no error. */
-void showVersionInfo(void)
+static void showVersionInfo(void) {
-{
   printf("%s%s%s%s%s", treeDescription, newLine, treeGoal, treePlatforms, newLine);
   printf(version, VERSION);
   printf("%s%s%s%s%s", writtenBy, writtenDate, contact, newLine, newLine);
   printf("%s%s", copyright, newLine);
   exit(1);
+}
 /* Displays error messge for invalid drives and exits */
-void showInvalidDrive(void)
+static void showInvalidDrive(void) {
-{
   printf(invalidDrive);
   exit(1);
+}
 /* Takes a fullpath, splits into drive (C:, or \\server\share) and path */
-void splitpath(char *fullpath, char *drive, char *path);
+static void splitpath(char *fullpath, char *drive, char *path);
 /**
  * Takes a given path, strips any \ or / that may appear on the end.
  * Returns a pointer to its static buffer containing path
  * without trailing slash and any necessary display conversions.
  */
-char *fixPathForDisplay(char *path);
+static char *fixPathForDisplay(char *path);
 /* Displays error message for invalid path; Does NOT exit */
-void showInvalidPath(char *path)
+static void showInvalidPath(char *path) {
-{
   char partialPath[MAXBUF], dummy[MAXBUF];
   pprintf("%s\n", path);
   splitpath(path, dummy, partialPath);
   pprintf(invalidPath, fixPathForDisplay(partialPath));
+}
 /* Displays error message for out of memory; Does NOT exit */
-void showOutOfMemory(char *path)
+static void showOutOfMemory(char *path) {
-{
   pprintf(outOfMemory, path);
+}
 /* Displays buffer exceeded message and exits */
-void showBufferOverrun(WORD maxSize)
+static void showBufferOverrun(WORD maxSize) {
-{
   printf(bufferToSmall, maxSize);
   exit(1);
+}
  * the rest of the fullpath including the slash are placed in
  * path, eg "\mysubdir"; where fullpath is "\\KJD\myshare\mysubdir".
  * None of these may be NULL, and drive and path must be large
  * enough to hold fullpath.
  */
-void splitpath(char *fullpath, char *drive, char *path)
+static void splitpath(char *fullpath, char *drive, char *path) {
-{
   char *src = fullpath;
   char oldchar;
   /* If either network share or path only starting at root directory */
   if ( (*src == '\\') || (*src == '/') )
+  }
+}
 /* Converts given path to full path */
-void getProperPath(char *fullpath)
+static void getProperPath(char *fullpath) {
-{
   char drive[MAXBUF];
   char path[MAXBUF];
   splitpath(fullpath, drive, path);
   /* else leave alone, it has both a drive and path specified */
+}
 /* Parses the command line and sets global variables. */
-void parseArguments(int argc, char *argv[])
+static void parseArguments(int argc, char *argv[]) {
-{
   int i;     /* temp loop variable */
   /* if no drive specified on command line, use current */
   sprintf(path, "%c:.", 'A'+ getdrive());
  * error message is displayed and the program exits.
  * Volume and/or serial # returned may be blank if the path specified
  * does not contain them, or an error retrieving
  * (ie UNC paths under DOS), but path is valid.
  */
-void GetVolumeAndSerial(char *volume, char *serial, char *path)
+static void GetVolumeAndSerial(char *volume, char *serial, char *path) {
-{
   char rootPath[MAXBUF];
   char dummy[MAXBUF];
   union serialNumber {
     DWORD serialFull;
     struct {
  * Path must end in slash \ or /
  * On error (invalid path) displays message and returns -1L.
  * Stores additional directory data in ddata if non-NULL
  * and path is valid.
  */
-long hasSubdirectories(char *path, DIRDATA *ddata)
+static long hasSubdirectories(char *path, DIRDATA *ddata) {
-{
   static WIN32_FIND_DATA findData;
   HANDLE hnd;
   static char buffer[MAXBUF];
   int hasSubdirs = 0;
  * parentpath must end in \ or / or be NULL, however
  * parent should only be NULL for initialpath
  * if subdir does not end in slash, one is added to stored subdir
  * dsubdir is subdir already modified so ready to display to user
  */
-SUBDIRINFO *newSubdirInfo(SUBDIRINFO *parent, char *subdir, char *dsubdir)
+static SUBDIRINFO *newSubdirInfo(SUBDIRINFO *parent, char *subdir, char *dsubdir) {
-{
   int parentLen, subdirLen;
   SUBDIRINFO *temp;
   /* Get length of parent directory */
   if (parent == NULL)
  * characters and '\0', moreSubdirsFollow specifies if
  * this is the last subdirectory in a given directory
  * or if more follow (hence if a | is needed).
  * padding must not be NULL
  */
-char * addPadding(char *padding, int moreSubdirsFollow)
+static char * addPadding(char *padding, int moreSubdirsFollow) {
-{
-    if (moreSubdirsFollow)
+  if (moreSubdirsFollow) {
-    {
-      /* 1st char is | or a vertical bar */
+    /* 1st char is | or a vertical bar */
-      if (charSet == EXTENDEDCHARS)
+    if (charSet == EXTENDEDCHARS) {
-        strcat(padding, VERTBAR_STR);
+      strcat(padding, VERTBAR_STR);
-      else
+    } else {
-        strcat(padding, "|   ");
+      strcat(padding, "|   ");
+    }
-    else
+  } else {
-      strcat(padding, "    ");
+    strcat(padding, "    ");
+  }
-    return padding;
+  return(padding);
+}
 /**
  * Removes the last padding added (last 4 characters added).
  * Does nothing if less than 4 characters in string.
  * padding must not be NULL
  * Returns the pointer to padding.
  */
-char * removePadding(char *padding)
+static char *removePadding(char *padding) {
-{
   size_t len = strlen(padding);
   if (len < 4) return padding;
   *(padding + len - 4) = '\0';
 /**
  * Takes a given path, strips any \ or / that may appear on the end.
  * Returns a pointer to its static buffer containing path
  * without trailing slash and any necessary display conversions.
  */
-char *fixPathForDisplay(char *path)
+static char *fixPathForDisplay(char *path) {
-{
   static char buffer[MAXBUF];
   int pathlen;
   strcpy(buffer, path);
   pathlen = strlen(buffer);
-  if (pathlen > 1)
+  if (pathlen > 1) {
-  {
     pathlen--;
-    if ((buffer[pathlen] == '\\') || (buffer[pathlen] == '/'))
+    if ((buffer[pathlen] == '\\') || (buffer[pathlen] == '/')) {
       buffer[pathlen] = '\0'; // strip off trailing slash on end
+    }
+  }
   return buffer;
+}
  * currentpath is an ASCIIZ string of path to display
  *             assumed to be a displayable path (ie. OEM or UTF-8)
  * padding is an ASCIIZ string to display prior to entry.
  * moreSubdirsFollow is -1 for initial path else >= 0.
  */
-void showCurrentPath(char *currentpath, char *padding, int moreSubdirsFollow, DIRDATA *ddata)
+static void showCurrentPath(char *currentpath, char *padding, int moreSubdirsFollow, DIRDATA *ddata) {
-{
   if (padding != NULL)
     pprintf("%s", padding);
   /* print lead padding except for initial directory */
   if (moreSubdirsFollow >= 0)
+    {
       if (moreSubdirsFollow)
         pprintf("%s", TBAR_HORZBAR_STR);
       else
         pprintf("%s", CBAR_HORZBAR_STR);
-    }
-    else
+    } else {
-    {
       if (moreSubdirsFollow)
         pprintf("+---");
       else
         pprintf("\\---");
+    }
 /**
  * Displays summary information about directory.
  * Expects to be called after displayFiles (optionally called)
  */
-static void displaySummary(char *padding, int hasMoreSubdirs, DIRDATA *ddata)
+static void displaySummary(char *padding, int hasMoreSubdirs, DIRDATA *ddata) {
-{
   addPadding(padding, hasMoreSubdirs);
-  if (dspSumDirs)
+  if (dspSumDirs) {
-  {
-    if (showFiles == SHOWFILESON)
+    if (showFiles == SHOWFILESON) {
-    {
       /* print File summary with lead padding, add filesize to it */
       pprintf("%s%lu files\n", padding, ddata->fileCnt);
+    }
     /* print Directory summary with lead padding */
  * Path must end in slash \ or /
  * Returns -1 on error,
  *          0 if no files, but no errors either,
  *      or  1 if files displayed, no errors.
  */
-int displayFiles(char *path, char *padding, int hasMoreSubdirs, DIRDATA *ddata)
+static int displayFiles(char *path, char *padding, int hasMoreSubdirs, DIRDATA *ddata) {
-{
   static char buffer[MAXBUF];
   WIN32_FIND_DATA entry; /* current directory entry info    */
   HANDLE dir;         /* Current directory entry working with      */
   unsigned long filesShown = 0;
  * was found, and if so copies appropriate data into subdir and dsubdir.
  * It will repeat until a valid subdirectory is found or no more
  * are found, at which point it closes the FindFile search handle and
  * return INVALID_HANDLE_VALUE.  If successful, returns FindFile handle.
  */
-HANDLE cycleFindResults(HANDLE findnexthnd, WIN32_FIND_DATA_BOTH *entry, char *subdir, char *dsubdir)
+static HANDLE cycleFindResults(HANDLE findnexthnd, WIN32_FIND_DATA_BOTH *entry, char *subdir, char *dsubdir) {
-{
   /* cycle through directory until 1st non . or .. directory is found. */
   do
+  {
     /* skip files & hidden or system directories */
     if ((((entry->ad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) ||
  * findclose when directory has finished processing, and can be
  * passed to findnextsubdir to find subsequent subdirectories.
  * Returns INVALID_HANDLE_VALUE on error.
  * currentpath must end in \
  */
-HANDLE findFirstSubdir(char *currentpath, char *subdir, char *dsubdir)
+static HANDLE findFirstSubdir(char *currentpath, char *subdir, char *dsubdir) {
-{
   static char buffer[MAXBUF];
   HANDLE dir;         /* Current directory entry working with      */
   /* get handle for files in current directory (using wildcard spec) */
   strcpy(buffer, currentpath);
  * dsubdir is the name to display (lfn or sfn as appropriate)
  * currentpath must end in \
  * If a subdirectory is found, returns 0, otherwise returns 1
  * (either error or no more files).
  */
-int findNextSubdir(HANDLE findnexthnd, char *subdir, char *dsubdir)
+static int findNextSubdir(HANDLE findnexthnd, char *subdir, char *dsubdir) {
-{
   /* clear result path */
   strcpy(subdir, "");
   if (FindNextFile(findnexthnd, &findSubdir_entry.ad) == 0) return 1; // no subdirs found
  * a non-recursive function using a Stack.
  * initialpath must be large enough to hold an added slash \ or /
  * if it does not already end in one.
  * Returns the count of subdirs in initialpath.
  */
-long traverseTree(char *initialpath)
+static long traverseTree(char *initialpath) {
-{
   long subdirsInInitialpath;
   char padding[MAXPADLEN] = "";
   char subdir[MAXBUF];
   char dsubdir[MAXBUF];
   SUBDIRINFO *sdi;
  * returns a pointer to its internal buffer, so strcpy soon after use.
  * Can only handle lines up to MAXLINE chars.
  * This is required because most messages are passed as
  * string arguments to printf, and not actually parsed by it.
  */
-char *processLine(char *line)
+static char *processLine(char *line) {
-{
   static char buffer[MAXLINE+MAXLINE];
   char *src = line, *dst = buffer;
   if (line == NULL) return NULL;
   return buffer;
+}
-void FixOptionText(void)
+static void FixOptionText(void) {
-{
   char buffer[MAXLINE];  /* sprintf can have problems with src==dest */
   /* Handle %c for options within messages using Set 8 */
   strcpy(buffer, treeUsage);
   sprintf(treeUsage, buffer, optionchar1, OptShowFiles[0], optionchar1, OptUseASCII[0]);
   sprintf(useTreeHelp, buffer, optionchar1);
+}
 /* Loads all messages from the message catalog. */
-void loadAllMessages(void)
+static void loadAllMessages(void) {
-{
   /* Changes %c in certain lines with proper option characters. */
   FixOptionText();
+}
-int main(int argc, char *argv[])
+int main(int argc, char **argv) {
-{
   char serial[SERIALLEN]; /* volume serial #  0000:0000 */
   char volume[VOLLEN];    /* volume name (label), possibly none */
   /* Load all text from message catalog (or uses hard coded text) */
   loadAllMessages();

Subversion Repositories SvarDOS

(root)//tree/trunk/tree.c – Rev 2035 → 2037