Remove the USE_WIN32STREAMEXTRACTION #defines (always on)

[bacula/bacula] / bacula / src / filed / status.c

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index daa6b15e3283bcf9eeba75d1d7e14ad8f298001b..fdeb2abf57f58690018a8fc633883c2266e922f2 100755 (executable)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -72,7 +72,7 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
         dt, num_jobs_run, num_jobs_run == 1 ? "" : "s");
    sendit(msg, len, arg);
 #if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
-   if (/*debug_level > 0*/ true) {
+   if (debug_level > 0) {
       if (!privs) {
          privs = enable_backup_privileges(NULL, 1);
       }
@@ -109,9 +109,11 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
                  p_SetCurrentDirectoryA?"":"!",
                  p_SetCurrentDirectoryW?"":"!");
       sendit(msg, len, arg);
-      len = Mmsg(msg, " %sGCDA,%sGCDW\n",  
+      len = Mmsg(msg, " %sGCDA,%sGCDW,%sGVPNW,%sGVNFVMPW\n",  
                  p_GetCurrentDirectoryA?"":"!",
-                 p_GetCurrentDirectoryW?"":"!");
+                 p_GetCurrentDirectoryW?"":"!",
+                 p_GetVolumePathNameW?"":"!",
+                 p_GetVolumeNameForVolumeMountPointW?"":"!");
      sendit(msg, len, arg);
    }
 #endif
@@ -334,15 +336,13 @@ int qstatus_cmd(JCR *jcr)
          }
          free_jcr(njcr);
       }
-   }
-   else if (strcmp(time, "last") == 0) {
+   } else if (strcmp(time, "last") == 0) {
       bnet_fsend(dir, OKqstatus, time);
       if ((last_jobs) && (last_jobs->size() > 0)) {
          job = (s_last_job*)last_jobs->last();
          bnet_fsend(dir, DotStatusJob, job->JobId, job->JobStatus, job->Errors);
       }
-   }
-   else {
+   } else {
       pm_strcpy(&jcr->errmsg, dir->msg);
       Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
       bnet_fsend(dir, _("2900 Bad .status command, wrong argument.\n"));