X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=examples%2Fupdatewim.c;h=0483d5e73542b1c53042016f7e5ea3bd2cd94f94;hp=d46f24d21eda807fe9f22d3bfb097e35c5384f1b;hb=HEAD;hpb=eb3e3b72db23ecaa7789a807afeb9577962653fe

diff --git a/examples/updatewim.c b/examples/updatewim.c
index d46f24d2..a929886f 100644
--- a/examples/updatewim.c
+++ b/examples/updatewim.c
@@ -2,33 +2,56 @@
  * updatewim.c - A program to add a file or directory tree to the first image of
  * a WIM file.
  *
- * The following copying information applies to this specific source code file:
+ * Copyright 2022 Eric Biggers
  *
- * Written in 2014 by Eric Biggers <ebiggers3@gmail.com>
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
  *
- * To the extent possible under law, the author(s) have dedicated all copyright
- * and related and neighboring rights to this software to the public domain
- * worldwide via the Creative Commons Zero 1.0 Universal Public Domain
- * Dedication (the "CC0").
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
  *
- * This software is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the CC0 for more details.
- *
- * You should have received a copy of the CC0 along with this software; if not
- * see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include <wimlib.h>
 #include <string.h>
 
-int main(int argc, char **argv)
+/*
+ * Windows compatibility defines for string encoding.  Applications using wimlib
+ * that need to run on both UNIX and Windows will need to do something similar
+ * to this, whereas applications that only need to run on one or the other can
+ * just use their platform's convention directly.
+ */
+#ifdef _WIN32
+#  define main		wmain
+   typedef wchar_t	tchar;
+#  define TS		"ls"
+#else
+   typedef char		tchar;
+#  define TS		"s"
+#endif
+
+int main(int argc, tchar **argv)
 {
 	int ret;
-	char *wimfile;
-	char *wim_target_path;
-	char *fs_source_path;
+	tchar *wimfile;
+	tchar *wim_target_path;
+	tchar *fs_source_path;
 	WIMStruct *wim = NULL;
+	struct wimlib_update_command cmds[1];
 
 	/* Check for the correct number of arguments.  */
 	if (argc != 4) {
@@ -53,8 +76,6 @@ int main(int argc, char **argv)
 	 * sake of demonstration we will use the more general function
 	 * wimlib_update_image().  */
 
-	struct wimlib_update_command cmds[1];
-
 	memset(cmds, 0, sizeof(cmds));
 
 	/* Set up an "add" operation.
@@ -99,8 +120,8 @@ out:
 
 	/* Check for error status.  */
 	if (ret != 0) {
-		fprintf(stderr, "wimlib error %d: %s\n",
-			ret, wimlib_get_error_string(ret));
+		fprintf(stderr, "wimlib error %d: %" TS"\n",
+			ret, wimlib_get_error_string((enum wimlib_error_code)ret));
 	}
 
 	/* Free global memory (optional).  */