X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Fguestfs-internal.h;h=494003ef0af48a3acb67c8ed6d260475bb928ca4;hp=1730f6886602963d59fbe7a0dfcd891e742c4dfa;hb=04fbcc63ebf5718608f199eb6b09061cd32283c3;hpb=a986e8dadb0c70634f6d1d89dd3e7bb5d9af3078;ds=sidebyside diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index 1730f68..494003e 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -22,9 +22,7 @@ #include #include -#ifdef HAVE_PCRE #include -#endif #define STREQ(a,b) (strcmp((a),(b)) == 0) #define STRCASEEQ(a,b) (strcasecmp((a),(b)) == 0) @@ -82,8 +80,15 @@ */ #define MAX_REGISTRY_SIZE (100 * 1000 * 1000) -/* Maximum RPM or dpkg database we will download to /tmp. */ -#define MAX_PKG_DB_SIZE (10 * 1000 * 1000) +/* Maximum RPM or dpkg database we will download to /tmp. RPM + * 'Packages' database can get very large: 70 MB is roughly the + * standard size for a new Fedora install, and after lots of package + * installation/removal I have seen well over 100 MB databases. + */ +#define MAX_PKG_DB_SIZE (300 * 1000 * 1000) + +/* Maximum size of Windows explorer.exe. 2.6MB on Windows 7. */ +#define MAX_WINDOWS_EXPLORER_SIZE (4 * 1000 * 1000) /* Network configuration of the appliance. Note these addresses are * only meaningful within the context of the running appliance. QEMU @@ -143,7 +148,7 @@ struct guestfs_h char *qemu_help, *qemu_version; /* Output of qemu -help, qemu -version. */ char **cmdline; /* Qemu command line. */ - int cmdline_size; + size_t cmdline_size; int verbose; int trace; @@ -163,6 +168,10 @@ struct guestfs_h int selinux; /* selinux enabled? */ + int pgroup; /* Create process group for children? */ + + int smp; /* If > 1, -smp flag passed to qemu. */ + char *last_error; int last_errnum; /* errno, or 0 if there was no errno */ @@ -191,6 +200,11 @@ struct guestfs_h FILE *trace_fp; char *trace_buf; size_t trace_len; + + /* User cancelled transfer. Not signal-atomic, but it doesn't + * matter for this case because we only care if it is != 0. + */ + int user_cancel; }; /* Per-filesystem data stored for inspect_os. */ @@ -237,6 +251,9 @@ enum inspect_os_distro { OS_DISTRO_LINUX_MINT, OS_DISTRO_MANDRIVA, OS_DISTRO_SLACKWARE, + OS_DISTRO_CENTOS, + OS_DISTRO_SCIENTIFIC_LINUX, + OS_DISTRO_TTYLINUX, }; enum inspect_os_package_format { @@ -314,7 +331,6 @@ extern void guestfs___debug (guestfs_h *g, const char *fs, ...) extern void guestfs___trace (guestfs_h *g, const char *fs, ...) __attribute__((format (printf,2,3))); extern const char *guestfs___persistent_tmpdir (void); -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___free_inspect_info (guestfs_h *g); extern int guestfs___set_busy (guestfs_h *g); @@ -332,22 +348,22 @@ extern int guestfs___build_appliance (guestfs_h *g, char **kernel, char **initrd extern void guestfs___launch_send_progress (guestfs_h *g, int perdozen); extern void guestfs___print_BufferIn (FILE *out, const char *buf, size_t buf_size); extern void guestfs___print_BufferOut (FILE *out, const char *buf, size_t buf_size); -#ifdef HAVE_PCRE extern int guestfs___match (guestfs_h *g, const char *str, const pcre *re); extern char *guestfs___match1 (guestfs_h *g, const char *str, const pcre *re); extern int guestfs___match2 (guestfs_h *g, const char *str, const pcre *re, char **ret1, char **ret2); extern int guestfs___match3 (guestfs_h *g, const char *str, const pcre *re, char **ret1, char **ret2, char **ret3); -#endif extern int guestfs___feature_available (guestfs_h *g, const char *feature); extern void guestfs___free_string_list (char **); -extern int guestfs___checkpoint_cmdline (guestfs_h *g); -extern void guestfs___rollback_cmdline (guestfs_h *g, int pos); +extern size_t guestfs___checkpoint_cmdline (guestfs_h *g); +extern void guestfs___rollback_cmdline (guestfs_h *g, size_t pos); extern void guestfs___call_callbacks_void (guestfs_h *g, uint64_t event); extern void guestfs___call_callbacks_message (guestfs_h *g, uint64_t event, const char *buf, size_t buf_len); extern void guestfs___call_callbacks_array (guestfs_h *g, uint64_t event, const uint64_t *array, size_t array_len); -#if defined(HAVE_PCRE) && defined(HAVE_HIVEX) +extern int guestfs___is_file_nocase (guestfs_h *g, const char *); +extern int guestfs___is_dir_nocase (guestfs_h *g, const char *); +#if defined(HAVE_HIVEX) extern int guestfs___check_for_filesystem_on (guestfs_h *g, const char *device, int is_block, int is_partnum); -extern int guestfs___download_to_tmp (guestfs_h *g, const char *filename, const char *basename, int64_t max_size); +extern char *guestfs___download_to_tmp (guestfs_h *g, struct inspect_fs *fs, const char *filename, const char *basename, int64_t max_size); extern char *guestfs___case_sensitive_path_silently (guestfs_h *g, const char *); extern struct inspect_fs *guestfs___search_for_root (guestfs_h *g, const char *root); extern int guestfs___parse_unsigned_int (guestfs_h *g, const char *str); @@ -360,6 +376,7 @@ extern int guestfs___read_db_dump (guestfs_h *g, const char *dumpfile, void *opa extern int guestfs___check_installer_root (guestfs_h *g, struct inspect_fs *fs); extern int guestfs___check_linux_root (guestfs_h *g, struct inspect_fs *fs); extern int guestfs___check_freebsd_root (guestfs_h *g, struct inspect_fs *fs); +extern int guestfs___has_windows_systemroot (guestfs_h *g); extern int guestfs___check_windows_root (guestfs_h *g, struct inspect_fs *fs); #endif @@ -375,11 +392,9 @@ extern int guestfs___check_windows_root (guestfs_h *g, struct inspect_fs *fs); #define safe_strndup guestfs_safe_strndup #define safe_memdup guestfs_safe_memdup #define safe_asprintf guestfs_safe_asprintf -#ifdef HAVE_PCRE #define match guestfs___match #define match1 guestfs___match1 #define match2 guestfs___match2 #define match3 guestfs___match3 -#endif #endif /* GUESTFS_INTERNAL_H_ */