[src/trunk]: src/usr.sbin/makefs By default, do not omit the trailing period ...

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1a77e1a9283d
branches:  trunk
changeset: 584226:1a77e1a9283d
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Sun Sep 11 22:01:44 2005 +0000

description:
By default, do not omit the trailing period from ISO9660 filenames
unless given the option '-o omit-trailing-period'.  Also, fix a
logic error so that makefs obeys option '-o omit-trailing-period'
when it is given.

diffstat:

 usr.sbin/makefs/cd9660.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r 0fd262218599 -r 1a77e1a9283d usr.sbin/makefs/cd9660.c
--- a/usr.sbin/makefs/cd9660.c  Sun Sep 11 21:57:24 2005 +0000
+++ b/usr.sbin/makefs/cd9660.c  Sun Sep 11 22:01:44 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cd9660.c,v 1.2 2005/08/15 06:41:06 he Exp $    */
+/*     $NetBSD: cd9660.c,v 1.3 2005/09/11 22:01:44 dyoung Exp $        */
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -101,7 +101,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660.c,v 1.2 2005/08/15 06:41:06 he Exp $");
+__RCSID("$NetBSD: cd9660.c,v 1.3 2005/09/11 22:01:44 dyoung Exp $");
 #endif  /* !__lint */
 
 #include <string.h>
@@ -405,7 +405,7 @@
        else if (CD9660_IS_COMMAND_ARG(var,"allow-multidot"))
                diskStructure.allow_multidot = 1;
        else if (CD9660_IS_COMMAND_ARG(var, "omit-trailing-period"))
-               diskStructure.omit_trailing_period = 0;
+               diskStructure.omit_trailing_period = 1;
        else if (CD9660_IS_COMMAND_ARG(var, "no-emul-boot") ||
                    CD9660_IS_COMMAND_ARG(var, "no-boot") ||
                    CD9660_IS_COMMAND_ARG(var, "hard-disk-boot") ||
@@ -1738,6 +1738,8 @@
                }
                oldname ++;
        }
+       if (!found_ext && !diskStructure.omit_trailing_period)
+               *newname++ = '.';
        /* Add version */
        *(newname++) = ';';
        sprintf((newname++), "%i", 1);
@@ -1790,7 +1792,8 @@
                }
                oldname ++;
        }
-
+       if (!found_ext && !diskStructure.omit_trailing_period)
+               *newname++ = '.';
        /* Add version */
        *(newname++) = ';';
        sprintf((newname++), "%i", 1);