Re: Build break - port amd64 - tools/makefs

[Jimmy Johansson <jimmy+current%Update.UU.SE@localhost>]

On Tue, Aug 23, 2011 at 11:41:01AM -0700, Paul Goyette wrote:
> #   compile  makefs/cd9660.lo
> cc -O -I. -I/test-bed/tools/include/nbinclude -I/test-bed/tools/include 
> -I/test-bed/obj/tools/compat -I/test-bed/obj/tools/compat/include 
> -I/test-bed/src/tools/makefs/../compat -DHAVE_NBTOOL_CONFIG_H=1 
> -D_FILE_OFFSET_BITS=64 -I/test-bed/src/tools/makefs/../../usr.sbin/makefs 
> -I/test-bed/src/sbin/mknod -I/test-bed/src/usr.sbin/mtree 
> -I/test-bed/src/sys/fs/cd9660 -DV7FS_EI -I/test-bed/src/sys/fs/v7fs 
> -I/test-bed/src/sbin/newfs_v7fs -I/test-bed/src/sbin/fsck -c -o cd9660.lo.o   
>  /test-bed/src/tools/makefs/../../usr.sbin/makefs/cd9660.c
> /test-bed/src/tools/makefs/../../usr.sbin/makefs/cd9660.c:1674:2: error: 
> expected identifier or '(' before 'if'
> /test-bed/src/tools/makefs/../../usr.sbin/makefs/cd9660.c:1680:2: error: 
> expected identifier or '(' before 'return'
> /test-bed/src/tools/makefs/../../usr.sbin/makefs/cd9660.c:1681:1: error: 
> expected identifier or '(' before '}' token

I see that too and I think the fix is this simple (patch):

Index: tools/makefs/../../usr.sbin/makefs/cd9660.c
===================================================================
RCS file: /cvsroot/src/usr.sbin/makefs/cd9660.c,v
retrieving revision 1.32
diff -u -w -p -r1.32 cd9660.c
--- tools/makefs/../../usr.sbin/makefs/cd9660.c 23 Aug 2011 17:09:11 -0000      
1.32
+++ tools/makefs/../../usr.sbin/makefs/cd9660.c 23 Aug 2011 19:24:45 -0000
@@ -1654,7 +1654,6 @@ cd9660_level1_convert_filename(const cha
                        /* Enforce 12.3 / 8 */
                        if (namelen == 8 && !found_ext)
                                break;
-                       }

                        if (islower((unsigned char)*oldname))
                                *newname++ = toupper((unsigned char)*oldname);

Regards,

Jimmy
-- 
If you don't shoot the bearers of bad news, people will keep bringing it to you.