Differences From:

File src/main.c part of check-in [d5695157d0] - Deal with windows filename aliasing in the "all" command. Ticket 974618fe5a8. Also display the home directory for windows users with the "info" command since the home directory is non-obvious in windows. by drh on 2009-11-11 16:21:19. [view]

To:

File src/main.c part of check-in [97789f0a92] - clean up a few compiler warnings by rwilson on 2009-12-29 22:10:29. Also file src/main.c part of check-in [76bc05d739] - merge with trunk by btheado on 2009-12-30 20:33:59. [view]

@@ -68,8 +68,9 @@
   char *zLocalRoot;       /* The directory holding the  local database */
   int minPrefix;          /* Number of digits needed for a distinct UUID */
   int fSqlTrace;          /* True if -sqltrace flag is present */
   int fSqlPrint;          /* True if -sqlprint flag is present */
+  int fQuiet;             /* True if -quiet flag is present */
   int fHttpTrace;         /* Trace outbound HTTP requests */
   int fNoSync;            /* Do not do an autosync even.  --nosync */
   char *zPath;            /* Name of webpage being served */
   char *zExtra;           /* Extra path information past the webpage name */
@@ -233,8 +234,9 @@
   }else if( argc<2 ){
     fprintf(stderr, "Usage: %s COMMAND ...\n", argv[0]);
     exit(1);
   }else{
+    g.fQuiet = find_option("quiet", 0, 0)!=0;
     g.fSqlTrace = find_option("sqltrace", 0, 0)!=0;
     g.fSqlPrint = find_option("sqlprint", 0, 0)!=0;
     g.fHttpTrace = find_option("httptrace", 0, 0)!=0;
     g.zLogin = find_option("user", "U", 1);
@@ -734,9 +736,9 @@
   login_set_capabilities("s");
   cmd_http();
 }
 
-
+#ifndef __MINGW32__
 #if !defined(__DARWIN__) && !defined(__APPLE__)
 /*
 ** Search for an executable on the PATH environment variable.
 ** Return true (1) if found and false (0) if not found.
@@ -756,8 +758,9 @@
     zPath += i;
   }
   return 0;
 }
+#endif
 #endif
 
 /*
 ** COMMAND: server