RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: popt                             Date:   24-Aug-2007 15:14:42
  Branch: HEAD                             Handle: 2007082414144100

  Modified files:
    popt                    configure.ac popthelp.c

  Log:
    more --help fiddles from bugzilla #178413.

  Summary:
    Revision    Changes     Path
    1.28        +2  -2      popt/configure.ac
    1.62        +8  -6      popt/popthelp.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: popt/configure.ac
  ============================================================================
  $ cvs diff -u -r1.27 -r1.28 configure.ac
  --- popt/configure.ac	13 Aug 2007 15:38:36 -0000	1.27
  +++ popt/configure.ac	24 Aug 2007 13:14:41 -0000	1.28
  @@ -68,7 +68,7 @@
   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 @@
   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])
   
  @@ .
  patch -p0 <<'@@ .'
  Index: popt/popthelp.c
  ============================================================================
  $ cvs diff -u -r1.61 -r1.62 popthelp.c
  --- popt/popthelp.c	15 Aug 2007 18:58:05 -0000	1.61
  +++ popt/popthelp.c	24 Aug 2007 13:14:41 -0000	1.62
  @@ -407,9 +407,9 @@
   /*@=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,16 @@
   	char format[16];
   
   	ch = help + lineLength - 1;
  -	while (ch > help && !isspace(*ch)) ch--;
  +	while (ch > help && !isspace(*ch))
  +	    ch = POPT_prev_char (ch);
   	if (ch == help) break;		/* give up */
  -	while (ch > (help + 1) && isspace(*ch)) ch--;
  +	while (ch > (help + 1) && isspace(*ch))
  +	    ch = POPT_prev_char (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 +444,7 @@
   /*@=boundsread@*/
   /*@=branchstate@*/
   
  -    if (helpLength) fprintf(fp, "%s\n", help);
  +    if (helpLength) POPT_fprintf(fp, "%s\n", help);
       help = NULL;
   
   out:
  @@ .