New internal function guestfs___print_timestamped_argv

[libguestfs.git] / src / guestfs-internal.h

diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
index 32a6c2a..10c9503 100644 (file)
--- a/src/guestfs-internal.h
+++ b/src/guestfs-internal.h
@@ -38,6 +38,11 @@
 #define N_(str) str
 #endif
 
 #define N_(str) str
 #endif
 

+#define TMP_TEMPLATE_ON_STACK(var)                        \
+  const char *ttos_tmpdir = guestfs_tmpdir ();            \
+  char var[strlen (ttos_tmpdir) + 32];                    \
+  sprintf (var, "%s/libguestfsXXXXXX", ttos_tmpdir)       \
+

 #define UNIX_PATH_MAX 108
 
 #ifndef MAX
 #define UNIX_PATH_MAX 108
 
 #ifndef MAX


@@ -132,6 +137,9 @@ struct guestfs_h
    */
   struct inspect_fs *fses;
   size_t nr_fses;
    */
   struct inspect_fs *fses;
   size_t nr_fses;

+
+  /* Private data area. */
+  struct hash_table *pda;

 };
 
 /* Per-filesystem data stored for inspect_os. */
 };
 
 /* Per-filesystem data stored for inspect_os. */


@@ -172,6 +180,7 @@ struct inspect_fs {
   int major_version;
   int minor_version;
   char *arch;
   int major_version;
   int minor_version;
   char *arch;

+  char *windows_systemroot;

   struct inspect_fstab_entry *fstab;
   size_t nr_fstab;
 };
   struct inspect_fstab_entry *fstab;
   size_t nr_fstab;
 };


@@ -192,8 +201,8 @@ extern void *guestfs_safe_realloc (guestfs_h *g, void *ptr, int nbytes);
 extern char *guestfs_safe_strdup (guestfs_h *g, const char *str);
 extern char *guestfs_safe_strndup (guestfs_h *g, const char *str, size_t n);
 extern void *guestfs_safe_memdup (guestfs_h *g, void *ptr, size_t size);
 extern char *guestfs_safe_strdup (guestfs_h *g, const char *str);
 extern char *guestfs_safe_strndup (guestfs_h *g, const char *str, size_t n);
 extern void *guestfs_safe_memdup (guestfs_h *g, void *ptr, size_t size);

+extern void guestfs___print_timestamped_argv (guestfs_h *g, const char *argv[]);

 extern void guestfs___print_timestamped_message (guestfs_h *g, const char *fs, ...);
 extern void guestfs___print_timestamped_message (guestfs_h *g, const char *fs, ...);

-extern const char *guestfs___tmpdir (void);

 extern void guestfs___free_inspect_info (guestfs_h *g);
 extern int guestfs___set_busy (guestfs_h *g);
 extern int guestfs___end_busy (guestfs_h *g);
 extern void guestfs___free_inspect_info (guestfs_h *g);
 extern int guestfs___set_busy (guestfs_h *g);
 extern int guestfs___end_busy (guestfs_h *g);


@@ -205,6 +214,7 @@ extern int guestfs___send_to_daemon (guestfs_h *g, const void *v_buf, size_t n);
 extern int guestfs___recv_from_daemon (guestfs_h *g, uint32_t *size_rtn, void **buf_rtn);
 extern int guestfs___accept_from_daemon (guestfs_h *g);
 extern int guestfs___build_appliance (guestfs_h *g, char **kernel, char **initrd, char **appliance);
 extern int guestfs___recv_from_daemon (guestfs_h *g, uint32_t *size_rtn, void **buf_rtn);
 extern int guestfs___accept_from_daemon (guestfs_h *g);
 extern int guestfs___build_appliance (guestfs_h *g, char **kernel, char **initrd, char **appliance);

+extern void guestfs___print_BufferIn (FILE *out, const char *buf, size_t buf_size);

 
 #define error guestfs_error
 #define perrorf guestfs_perrorf
 
 #define error guestfs_error
 #define perrorf guestfs_perrorf