Attachment 172393 Details for Bug 178413 – Patch for popt/configure.ac and popt/popthelp.c

[patch] Patch for popt/configure.ac and popt/popthelp.c

popt-2127588-i18n-stdio-head.diff (text/plain), 2.00 KB, created by fujiwara on 2007-08-24 06:22:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fujiwara

Created: 2007-08-24 06:22:38 UTC

Size: 2.00 KB

patch

obsolete

>--- popt/configure.ac.orig	2007-08-24 13:37:16.041363000 +0900
>+++ popt/configure.ac	2007-08-24 13:45:56.515911000 +0900
>@@ -68,7 +68,7 @@ if ! echo "${libdir}" | grep -q '64$' ; 
> fi
> AC_SUBST(MARK64)
> 
>-AC_CHECK_HEADERS(float.h libintl.h mcheck.h unistd.h)
>+AC_CHECK_HEADERS(float.h libintl.h mcheck.h unistd.h langinfo.h)
> 
> # For some systems we know that we have ld_version scripts.
> # Use it then as default.
>@@ -101,7 +101,7 @@ fi
> AC_CHECK_FUNC(setreuid, [], [
>     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
> ])
>-AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror)
>+AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror iconv)
> 
> AM_GNU_GETTEXT([external])
> 
>--- popt/popthelp.c.orig	2007-08-24 12:09:25.508334000 +0900
>+++ popt/popthelp.c	2007-08-24 15:11:58.722928000 +0900
>@@ -407,9 +407,9 @@ static void singleOptionHelp(FILE * fp, 
> /*@=boundswrite@*/
> 
>     if (help)
>-	fprintf(fp,"  %-*s   ", (int)(maxLeftCol+displaypad), left);
>+	POPT_fprintf(fp,"  %-*s   ", (int)(maxLeftCol+displaypad), left);
>     else {
>-	fprintf(fp,"  %s\n", left); 
>+	POPT_fprintf(fp,"  %s\n", left); 
> 	goto out;
>     }
> 
>@@ -426,14 +426,15 @@ static void singleOptionHelp(FILE * fp, 
> 	char format[16];
> 
> 	ch = help + lineLength - 1;
>-	while (ch > help && !isspace(*ch)) ch--;
>+	while (ch > help && !isspace((int)((unsigned char)*ch)))
>+	    ch = POPT_prev_char (ch);
> 	if (ch == help) break;		/* give up */
> 	while (ch > (help + 1) && isspace(*ch)) ch--;
> 	ch++;
> 
> 	sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), (int) indentLength);
> 	/*@-formatconst@*/
>-	fprintf(fp, format, help, " ");
>+	POPT_fprintf(fp, format, help, " ");
> 	/*@=formatconst@*/
> 	help = ch;
> 	while (isspace(*help) && *help) help++;
>@@ -442,7 +443,7 @@ static void singleOptionHelp(FILE * fp, 
> /*@=boundsread@*/
> /*@=branchstate@*/
> 
>-    if (helpLength) fprintf(fp, "%s\n", help);
>+    if (helpLength) POPT_fprintf(fp, "%s\n", help);
>     help = NULL;
> 
> out:

Actions: View | Diff

Attachments on bug 178413: 123474 | 138119 | 172393 | 172416