Re: PR/45285 CVS commit: src/usr.sbin/makefs

[Martin Matuska <mm%FreeBSD.org@localhost>]

The following reply was made to PR bin/45285; it has been noted by GNATS.

From: Martin Matuska <mm%FreeBSD.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: Christos Zoulas <christos%zoulas.com@localhost>, 
gnats-admin%netbsd.org@localhost, 
 netbsd-bugs%netbsd.org@localhost
Subject: Re: PR/45285 CVS commit: src/usr.sbin/makefs
Date: Tue, 23 Aug 2011 21:51:28 +0200

 This is a multi-part message in MIME format.
 --------------050608050508030407040804
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 I am really sorry but I don't know how that happened there was another
 displacement in the patch, too.
 Here is the bugfix:
 
 Index: usr.sbin/makefs/cd9660.c
 ===================================================================
 RCS file: /cvsroot/src/usr.sbin/makefs/cd9660.c,v
 retrieving revision 1.33
 diff -u -p -r1.33 cd9660.c
 --- usr.sbin/makefs/cd9660.c    23 Aug 2011 19:17:07 -0000    1.33
 +++ usr.sbin/makefs/cd9660.c    23 Aug 2011 19:50:20 -0000
 @@ -1635,9 +1635,9 @@ cd9660_level1_convert_filename(const cha
      int extlen = 0;
      int found_ext = 0;
  
 -    while (*oldname != '\0') {
 +    while (*oldname != '\0' && extlen < 3) {
          /* Handle period first, as it is special */
 -        if (*oldname == '.' && extlen < 3) {
 +        if (*oldname == '.') {
              if (found_ext) {
                  *newname++ = '_';
                  extlen ++;
 
 Thank you very much for understanding.
 Martin.
 
 On 23. 8. 2011 21:20, Christos Zoulas wrote:
 > The following reply was made to PR bin/45285; it has been noted by GNATS.
 >
 > From: christos%zoulas.com@localhost (Christos Zoulas)
 > To: Martin Matuska <mm%FreeBSD.org@localhost>, 
 > gnats-bugs%NetBSD.org@localhost
 > Cc: gnats-admin%netbsd.org@localhost, netbsd-bugs%netbsd.org@localhost
 > Subject: Re: PR/45285 CVS commit: src/usr.sbin/makefs
 > Date: Tue, 23 Aug 2011 15:17:57 -0400
 >
 >  On Aug 23,  8:10pm, mm%FreeBSD.org@localhost (Martin Matuska) wrote:
 >  -- Subject: Re: PR/45285 CVS commit: src/usr.sbin/makefs
 >  
 >  | My patch for cd9660.c contained one typo:
 >  | @@ -1652,8 +1652,7 @@ cd9660_level1_convert_filename(const cha
 >  |                             *oldname == ',' && strlen(oldname) == 4)
 >  |                                 break;
 >  |                         /* Enforce 12.3 / 8 */
 >  | -                       if (((namelen == 8) && !found_ext) ||
 >  | -                           (found_ext && extlen == 3)) {
 >  | +                       if (namelen == 8 && !found_ext)
 >  |                                 break;
 >  |                         }
 >  | 
 >  | 
 >  | The "}" at the end of this snipplet should be removed, too.
 >  | Thanks!
 >  
 >  Fixed already, thanks!
 >  
 >  christos
 >  
 
 
 -- 
 Martin Matuska
 FreeBSD committer
 http://blog.vx.sk
 
 
 --------------050608050508030407040804
 Content-Type: text/plain;
  name="cd9660_fix.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="cd9660_fix.patch"
 
 Index: usr.sbin/makefs/cd9660.c
 ===================================================================
 RCS file: /cvsroot/src/usr.sbin/makefs/cd9660.c,v
 retrieving revision 1.33
 diff -u -p -r1.33 cd9660.c
 --- usr.sbin/makefs/cd9660.c   23 Aug 2011 19:17:07 -0000      1.33
 +++ usr.sbin/makefs/cd9660.c   23 Aug 2011 19:50:20 -0000
 @@ -1635,9 +1635,9 @@ cd9660_level1_convert_filename(const cha
        int extlen = 0;
        int found_ext = 0;
  
 -      while (*oldname != '\0') {
 +      while (*oldname != '\0' && extlen < 3) {
                /* Handle period first, as it is special */
 -              if (*oldname == '.' && extlen < 3) {
 +              if (*oldname == '.') {
                        if (found_ext) {
                                *newname++ = '_';
                                extlen ++;
 
 --------------050608050508030407040804--