Merge tag 'upstream/3.3.3'

[debian/amanda] / common-src / util.h

diff --git a/common-src/util.h b/common-src/util.h
index a0a98e417e780335002a65f4a4db9338db2c3888..0e35bb8ac05f8c9f3dd5ab2cdd469c4a4efe943e 100644 (file)
--- a/common-src/util.h
+++ b/common-src/util.h
@@ -1,6 +1,7 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
  * Copyright (c) 1999 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  * All Rights Reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -30,7 +31,7 @@
 #define        UTIL_H
 
 #include "amanda.h"
-#include "sl.h"
+#include "am_sl.h"
 
 #include <glib.h>
 #include <glib-object.h>
@@ -391,4 +392,9 @@ void property_add_to_argv(GPtrArray *argv_ptr, GHashTable *proplist);
  */
 void debug_executing(GPtrArray *argv_ptr);
 
+/* execute the program and get the first line from stdout ot stderr */
+char *get_first_line(GPtrArray *argv_ptr);
+
+gboolean make_amanda_tmpdir(void);
+
 #endif /* UTIL_H */