* strlen -> mbstowcs (multibyte str to wide char str) conversion where we

  want the actual number of characters, not the number of bytes.
* Added a TODO to take care of later in scriptlet processing.

4 files changed, 17 insertions, 8 deletions

diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index a9e773a5..359b8bfc 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -509,12 +509,19 @@ int _alpm_runscriptlet(char *root, char *installfn, char *script, char *ver, cha
 			char line[1024];
 			if(fgets(line, 1024, pp) == NULL)
 				break;
+			/*TODO clean this code up, remove weird SCRIPTLET_START/DONE,
+			 * (void*)atol call, etc. */
 			/* "START <event desc>" */
-			if((strlen(line) > strlen(SCRIPTLET_START)) && !strncmp(line, SCRIPTLET_START, strlen(SCRIPTLET_START))) {
-				EVENT(trans, PM_TRANS_EVT_SCRIPTLET_START, _alpm_strtrim(line + strlen(SCRIPTLET_START)), NULL);
+			if((strlen(line) > strlen(SCRIPTLET_START))
+			   && !strncmp(line, SCRIPTLET_START, strlen(SCRIPTLET_START))) {
+				EVENT(trans, PM_TRANS_EVT_SCRIPTLET_START,
+				      _alpm_strtrim(line + strlen(SCRIPTLET_START)), NULL);
 			/* "DONE <ret code>" */
-			} else if((strlen(line) > strlen(SCRIPTLET_DONE)) && !strncmp(line, SCRIPTLET_DONE, strlen(SCRIPTLET_DONE))) {
-				EVENT(trans, PM_TRANS_EVT_SCRIPTLET_DONE, (void*)atol(_alpm_strtrim(line + strlen(SCRIPTLET_DONE))), NULL);
+			} else if((strlen(line) > strlen(SCRIPTLET_DONE))
+			          && !strncmp(line, SCRIPTLET_DONE, strlen(SCRIPTLET_DONE))) {
+				EVENT(trans, PM_TRANS_EVT_SCRIPTLET_DONE,
+				      (void*)atol(_alpm_strtrim(line + strlen(SCRIPTLET_DONE))),
+				      NULL);
 			} else {
 				_alpm_strtrim(line);
 				/* log our script output */
@@ -526,7 +533,8 @@ int _alpm_runscriptlet(char *root, char *installfn, char *script, char *ver, cha
 		exit(0);
 	} else {
 		if(waitpid(pid, 0, 0) == -1) {
-			_alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)"), strerror(errno));
+			_alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)"),
+			          strerror(errno));
 			retval = 1;
 			goto cleanup;
 		}
diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h
index 0eb1d3d4..277ddb47 100644
--- a/lib/libalpm/util.h
+++ b/lib/libalpm/util.h
@@ -51,6 +51,7 @@
 #define _(s) s
 #endif
 
+/*TODO wtf? why is this done like this? */
 #define SCRIPTLET_START "START "
 #define SCRIPTLET_DONE "DONE "
 
diff --git a/src/pacman/package.c b/src/pacman/package.c
index 145e5bbe..437e4420 100644
--- a/src/pacman/package.c
+++ b/src/pacman/package.c
@@ -94,7 +94,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
 
 	/* printed using a variable to make i18n safe */
 	printf("%s", descheader);
-	indentprint(alpm_pkg_get_desc(pkg), strlen(descheader));
+	indentprint(alpm_pkg_get_desc(pkg), mbstowcs(NULL, descheader, 0));
 	printf("\n");
 
 	/* Print additional package info if info flag passed more than once */
@@ -134,7 +134,7 @@ void dump_pkg_sync(pmpkg_t *pkg, const char *treename)
 	
 	/* printed using a variable to make i18n safe */
 	printf("%s", descheader);
-	indentprint(alpm_pkg_get_desc(pkg), strlen(descheader));
+	indentprint(alpm_pkg_get_desc(pkg), mbstowcs(NULL, descheader, 0));
 	printf("\n");
 	
 	if (md5sum != NULL && md5sum[0] != '\0') {
diff --git a/src/pacman/trans.c b/src/pacman/trans.c
index 2a699ada..a354955f 100644
--- a/src/pacman/trans.c
+++ b/src/pacman/trans.c
@@ -334,7 +334,7 @@ void cb_trans_progress(pmtransprog_t event, char *pkgname, const int percent,
 	/* determine room left for non-digits text [not ( 1/12) part] */
 	textlen = infolen - 3 - (2 * digits);
 	/* room left for package name */
-	pkglen = textlen - strlen(ptr) - 1;
+	pkglen = textlen - mbstowcs(NULL, ptr, 0) - 1;
 
 	switch (event) {
 		case PM_TRANS_PROGRESS_ADD_START: