- Correct typo in Copyright

[bacula/bacula] / bacula / src / tools / fstype.c

diff --git a/bacula/src/tools/fstype.c b/bacula/src/tools/fstype.c
index c34fe519632f0e20753ec7a387046e1f3e0e0b63..c164292453929334c7212f4025fa770d3db36aee 100644 (file)
--- a/bacula/src/tools/fstype.c
+++ b/bacula/src/tools/fstype.c
@@ -1,14 +1,14 @@
-/*  
+/*
  * Program for determining file system type
  *
  *   Written by Preben 'Peppe' Guldberg, December MMIV
- * 
+ *
  *   Version $Id$
- *   
+ *
  */
 
 /*
-   Copyright (C) 2004 Kern Sibbald               
+   Copyright (C) 2004 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -30,6 +30,10 @@
 #include "bacula.h"
 #include "findlib/find.h"
 
+/* Dummy functions */
+int generate_daemon_event(JCR *jcr, const char *event) 
+   { return 1; }
+
 static void usage()
 {
    fprintf(stderr, _(
@@ -50,7 +54,7 @@ static void usage()
 int
 main (int argc, char *const *argv)
 {
-   POOLMEM *fs;
+   char fs[1000];
    int verbose = 0;
    int status = 0;
    int ch, i;
@@ -58,13 +62,13 @@ main (int argc, char *const *argv)
    while ((ch = getopt(argc, argv, "v?")) != -1) {
       switch (ch) {
          case 'v':
-           verbose = 1;
-           break;
+            verbose = 1;
+            break;
          case '?':
-        default:
-           usage();
+         default:
+            usage();
 
-      }  
+      }
    }
    argc -= optind;
    argv += optind;
@@ -74,16 +78,15 @@ main (int argc, char *const *argv)
    }
 
    for (i = 0; i < argc; --argc, ++argv) {
-      if ((fs = fstype(*argv)) != NULL) {
-        if (verbose) {
+      if (fstype(*argv, fs, sizeof(fs))) {
+         if (verbose) {
             printf("%s: %s\n", *argv, fs);
-        } else {
-           puts(fs);
-        }
-        free(fs);
+         } else {
+            puts(fs);
+         }
       } else {
          fprintf(stderr, "%s: unknown\n", *argv);
-        status = 1;
+         status = 1;
       }
    }