Merge branch 'maint'

3 files changed, 14 insertions, 0 deletions

diff --git a/src/pacman/.gitignore b/src/pacman/.gitignore
index 3b2600fd..61407057 100644
--- a/src/pacman/.gitignore
+++ b/src/pacman/.gitignore
@@ -1,4 +1,5 @@
 .deps
 .libs
 pacman
+pacman.exe
 pacman.static
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 47b538e5..8a7af5c5 100644
--- a/src/pacman/callback.c
+++ b/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 */
diff --git a/src/util/.gitignore b/src/util/.gitignore
index 36688806..c85ea2ca 100644
--- a/src/util/.gitignore
+++ b/src/util/.gitignore
@@ -1,5 +1,8 @@
 .deps
 .libs
 vercmp
+vercmp.exe
 testpkg
+testpkg.exe
 testdb
+testdb.exe