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

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   07-Sep-2008 00:29:50
  Branch: rpm-5_1                          Handle: 2008090622294801

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES
    rpm/lib                 manifest.c

  Log:
    - jbj: display error msg for lusers attempting "rpm -qp /bin"
    (#461362).

  Summary:
    Revision    Changes     Path
    1.2288.2.107+1  -0      rpm/CHANGES
    2.22.4.1    +5  -1      rpm/lib/manifest.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.106 -r1.2288.2.107 CHANGES
  --- rpm/CHANGES	6 Sep 2008 19:00:37 -0000	1.2288.2.106
  +++ rpm/CHANGES	6 Sep 2008 22:29:48 -0000	1.2288.2.107
  @@ -1,4 +1,5 @@
   5.1.4 -> 5.1.5:
  +    - jbj: display error msg for lusers attempting "rpm -qp /bin" (#461362).
       - jbj: WR: remove version from config paths.
       - jbj: lua: fix: don't close dup'd stdout running lua scripts.
       - jbj: macosx: avoid multiple definitions of _program_name.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/manifest.c
  ============================================================================
  $ cvs diff -u -r2.22 -r2.22.4.1 manifest.c
  --- rpm/lib/manifest.c	19 Nov 2007 18:57:54 -0000	2.22
  +++ rpm/lib/manifest.c	6 Sep 2008 22:29:49 -0000	2.22.4.1
  @@ -95,7 +95,9 @@
   	/* Read next line. */
   	s = fgets(line, sizeof(line) - 1, f);
   	if (s == NULL) {
  -	    /* XXX Ferror check needed */
  +	    if (Ferror(xfd))
  +		rpmlog(RPMLOG_ERR, _("reading %s manifest failed: %s\n"),
  +			fdGetOPath(xfd), Fstrerror(xfd));
   	    break;
   	}
   
  @@ -119,6 +121,8 @@
   
   	/* Insure that file contains only ASCII */
   	if (*s < 32) {
  +	    rpmlog(RPMLOG_ERR, _("reading %s manifest, non-printable characters found\n"),
  +			fdGetOPath(xfd), Fstrerror(xfd));
   	    rpmrc = RPMRC_FAIL;	/* XXX reject non-printable manifests. */
   	    goto exit;
   	}
  @@ .