Merge branch 'maint'

configure.ac

@@ -176,8 +176,8 @@ AC_FUNC_FORK
 AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
 AC_FUNC_MKTIME
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([realpath regcomp strcasecmp strdup strerror strnlen \
-								strndup strrchr strsep strstr strverscmp uname geteuid])
+AC_CHECK_FUNCS([geteuid realpath regcomp strcasecmp strdup strerror \
+								strndup strrchr strsep strstr strverscmp swprintf uname])
 
 # Enable large file support if available
 AC_SYS_LARGEFILE

contrib/pacdiff

@@ -20,7 +20,7 @@
 # Original http://phraktured.net/config/bin/pacdiff
 
 diffprog=${DIFFPROG:-vimdiff}
-for x in $(find /etc/ -name *.pacnew -o -name *.pacorig -o -name *.pacsave)
+for x in $(find /etc/ -name "*.pacnew" -o -name "*.pacorig" -o -name "*.pacsave")
 do
     echo "File: ${x%.pac*}"
     chk="$(cmp $x ${x%.pac*})"

src/pacman/.gitignore

@@ -1,4 +1,5 @@
 .deps
 .libs
 pacman
+pacman.exe
 pacman.static

src/pacman/callback.c

@@ -361,7 +361,17 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
 	len = strlen(opr) + ((pkgname) ? strlen(pkgname) : 0) + 2;
 	wcstr = calloc(len, sizeof(wchar_t));
 	/* print our strings to the alloc'ed memory */
+#if defined(HAVE_SWPRINTF)
 	wclen = swprintf(wcstr, len, L"%s %s", opr, pkgname);
+#else
+	/* because the format string was simple, we can easily do this without
+	 * using swprintf, although it is probably not as safe/fast. The max
+	 * chars we can copy is decremented each time by subtracting the length
+	 * of the already printed/copied wide char string. */
+	wclen = mbstowcs(wcstr, opr, len);
+	wclen += mbstowcs(wcstr + wclen, " ", len - wclen);
+	wclen += mbstowcs(wcstr + wclen, pkgname, len - wclen);
+#endif
 	wcwid = wcswidth(wcstr, wclen);
 	padwid = textlen - wcwid;
 	/* if padwid is < 0, we need to trim the string so padwid = 0 */

src/util/.gitignore

@@ -1,5 +1,8 @@
 .deps
 .libs
 vercmp
+vercmp.exe
 testpkg
+testpkg.exe
 testdb
+testdb.exe