X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib.h;h=44008c789070797aaf4e895b58139cf64a48323e;hb=ce7a3173855e654bf1aa52f1b7d7e676667192cd;hp=b5dcd96dfd3b72ad1fd388dc0460db7ccd5c4f60;hpb=7ed55e914b616c71e3118ca9948c1350441a9fc2;p=wimlib

diff --git a/include/wimlib.h b/include/wimlib.h
index b5dcd96d..44008c78 100644
--- a/include/wimlib.h
+++ b/include/wimlib.h
@@ -191,6 +191,15 @@ typedef wchar_t wimlib_tchar;
 typedef char wimlib_tchar;
 #endif
 
+#ifdef __WIN32__
+/** Path separator for WIM paths passed back to progress callbacks. */
+#  define WIMLIB_WIM_PATH_SEPARATOR '\\'
+#  define WIMLIB_WIM_PATH_SEPARATOR_STRING L"\\"
+#else
+/** Path separator for WIM paths passed back to progress callbacks. */
+#  define WIMLIB_WIM_PATH_SEPARATOR '/'
+#  define WIMLIB_WIM_PATH_SEPARATOR_STRING "/"
+#endif
 /**
  * Specifies the compression type of a WIM file.
  */
@@ -290,6 +299,18 @@ enum wimlib_progress_msg {
 	 * @a info will point to ::wimlib_progress_info.rename. */
 	WIMLIB_PROGRESS_MSG_RENAME,
 
+	/**
+	 * A WIM update command is just about to be executed; @a info will point
+	 * to ::wimlib_progress_info.update.
+	 */
+	WIMLIB_PROGRESS_MSG_UPDATE_BEGIN_COMMAND,
+
+	/**
+	 * A WIM update command is just about to be executed; @a info will point
+	 * to ::wimlib_progress_info.update.
+	 */
+	WIMLIB_PROGRESS_MSG_UPDATE_END_COMMAND,
+
 	/** The contents of the WIM are being checked against the integrity
 	 * table.  Only happens when wimlib_open_wim() is called with the
 	 * ::WIMLIB_OPEN_FLAG_CHECK_INTEGRITY flag.  @a info will point to
@@ -438,6 +459,22 @@ union wimlib_progress_info {
 		const wimlib_tchar *to;
 	} rename;
 
+	/** Valid on messages ::WIMLIB_PROGRESS_MSG_UPDATE_BEGIN_COMMAND and
+	 * ::WIMLIB_PROGRESS_MSG_UPDATE_END_COMMAND. */
+	struct wimlib_progress_info_update {
+		/** Pointer to the update command that will be executed or has
+		 * just been executed. */
+		const struct wimlib_update_command *command;
+
+		/** Number of update commands that have been completed so far.
+		 */
+		size_t completed_commands;
+
+		/** Number of update commands that are being executed as part of
+		 * this call to wimlib_update_image(). */
+		size_t total_commands;
+	} update;
+
 	/** Valid on messages ::WIMLIB_PROGRESS_MSG_VERIFY_INTEGRITY and
 	 * ::WIMLIB_PROGRESS_MSG_CALC_INTEGRITY. */
 	struct wimlib_progress_info_integrity {
@@ -794,6 +831,14 @@ struct wimlib_capture_config {
 /** Do a "lazy" unmount (detach filesystem immediately, even if busy) */
 #define WIMLIB_UNMOUNT_FLAG_LAZY			0x00000010
 
+/******************************
+ * WIMLIB_UPDATE_FLAG_*
+ ******************************/
+
+/** Send ::WIMLIB_PROGRESS_MSG_UPDATE_BEGIN_COMMAND and
+ * ::WIMLIB_PROGRESS_MSG_UPDATE_END_COMMAND messages. */
+#define WIMLIB_UPDATE_FLAG_SEND_PROGRESS		0x00000001
+
 /******************************
  * WIMLIB_WRITE_FLAG_*
  ******************************/
@@ -994,15 +1039,15 @@ enum wimlib_error_code {
  *	Pointer to the ::WIMStruct for the WIM file to which the image is to be
  *	added.
  * @param name
- *	Name to give the new image.
+ *	Name to give the new image.  If @c NULL or empty, the new image is given
+ *	no name.  If nonempty, it must specify a name that does not already
+ *	exist in @a wim.
  * @param new_idx_ret
  *	If non-<code>NULL</code>, the index of the newly added image is returned
  *	in this location.
  *
  * @return 0 on success; nonzero on failure.  The possible error codes are:
  *
- * @retval ::WIMLIB_ERR_INVALID_PARAM
- *	@a name was @c NULL or an empty string.
  * @retval ::WIMLIB_ERR_SPLIT_UNSUPPORTED
  *	@a wim is part of a split WIM.
  * @retval ::WIMLIB_ERR_IMAGE_NAME_COLLISION
@@ -1037,8 +1082,9 @@ wimlib_add_empty_image(WIMStruct *wim,
  * 	A path to a directory or unmounted NTFS volume that will be captured as
  * 	a WIM image.
  * @param name
- * 	The name to give the image.  It must be nonempty and must specify a name
- * 	that does not yet exist in @a wim.
+ *	Name to give the new image.  If @c NULL or empty, the new image is given
+ *	no name.  If nonempty, it must specify a name that does not already
+ *	exist in @a wim.
  * @param config
  * 	Capture configuration that specifies files, directories, or path globs
  * 	to exclude from being captured.  If @c NULL, a dummy configuration where
@@ -2483,7 +2529,7 @@ wimlib_unmount_image(const wimlib_tchar *dir,
  * @param num_cmds
  *	Number of commands in @a cmds.
  * @param update_flags
- *	Reserved; must be 0.
+ *	::WIMLIB_UPDATE_FLAG_SEND_PROGRESS or 0.
  * @param progress_func
  *	If non-NULL, a function that will be called periodically with the
  *	progress of the current operation.