version 1.11.3

6 files changed, 39 insertions, 14 deletions

diff --git a/gnu/usr.sbin/mkisofs/ChangeLog b/gnu/usr.sbin/mkisofs/ChangeLog
index 62d713abcff..8c177683a7c 100644
--- a/gnu/usr.sbin/mkisofs/ChangeLog
+++ b/gnu/usr.sbin/mkisofs/ChangeLog
@@ -1,3 +1,26 @@
+Wed Nov  5 10:46:29 1997  Andreas Buschmann US/EC4 60/1F/110 #40409  <buschman@lts.sel.alcatel.de>
+
+	Circumvent a bug in the SunOS / Solaris CD-ROM driver (and maybe HP/UX, too).
+       
+       * mkisofs.8 (-S): Document switch.
+       *  mkisofs.c (split_SL_field): new Variable, new switch -S.
+       *  mkisofs.h (split_SL_field): new Variable.
+       * rock.c (generate_rock_ridge_attributes): only split SL field,
+       when split_SL_field is set.
+ 
+Tue Jun  3 15:32:21 1997  Andreas Buschmann <buschman@lts.sel.alcatel.de>
+ 
+       Circumvent a bug in the SunOS CD-ROM driver (and maybee HP/UX, too).
+ 
+       * mkisofs.8 (-s): Document switch.
+       * mkisofs.c (split_SL_component): new Variable, new switch -s.
+       * mkisofs.h (split_SL_component): new Variable.
+       * rock.c (generate_rock_ridge_attributes): only split SL
+       components, when split_SL_component is set.
+       
+       * defaults.h: Added SunOS string.
+       
+
 Wed Mar 19 16:50:17 1997  Fred Fish  <fnf@ninemoons.com>
 
 	* Makefile.in (CFLAGS): Let configure set basic flags.  Move
diff --git a/gnu/usr.sbin/mkisofs/mkisofs.8 b/gnu/usr.sbin/mkisofs/mkisofs.8
index f07e93856ae..0749cae0b92 100644
--- a/gnu/usr.sbin/mkisofs/mkisofs.8
+++ b/gnu/usr.sbin/mkisofs/mkisofs.8
@@ -1,7 +1,7 @@
-.\"	$OpenBSD: mkisofs.8,v 1.3 1999/09/23 04:11:59 alex Exp $
-.\"	$From: mkisofs.8,v 1.5 1997/04/10 02:45:50 eric Rel $
+.\"	$OpenBSD: mkisofs.8,v 1.4 1999/11/29 21:53:15 d Exp $
+.\"	$From: mkisofs.8,v 1.5.1.3 1998/06/02 03:36:16 eric Exp $
 .\" -*- nroff -*-
-.TH MKISOFS 8 "9 Apr 1997" "Version 1.11.2"
+.TH MKISOFS 8 "9 Apr 1997" "Version 1.11.3"
 .SH NAME
 mkisofs \- create a iso9660 filesystem with optional Rock Ridge attributes.
 .SH SYNOPSIS
diff --git a/gnu/usr.sbin/mkisofs/mkisofs.c b/gnu/usr.sbin/mkisofs/mkisofs.c
index c419501cccb..caf89542209 100644
--- a/gnu/usr.sbin/mkisofs/mkisofs.c
+++ b/gnu/usr.sbin/mkisofs/mkisofs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkisofs.c,v 1.2 1998/04/05 00:39:35 deraadt Exp $	*/
+/*	$OpenBSD: mkisofs.c,v 1.3 1999/11/29 21:53:15 d Exp $	*/
 /*
  * Program mkisofs.c - generate iso9660 filesystem  based upon directory
  * tree on hard disk.
@@ -21,7 +21,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-static char rcsid[] ="$From: mkisofs.c,v 1.9 1997/04/10 02:45:09 eric Rel $";
+static char rcsid[] ="$From: mkisofs.c,v 1.10.1.3 1998/06/02 03:36:16 eric Exp $";
 
 /* ADD_FILES changes made by Ross Biro biro@yggdrasil.com 2/23/95 */
 
@@ -61,7 +61,7 @@ static char rcsid[] ="$From: mkisofs.c,v 1.9 1997/04/10 02:45:09 eric Rel $";
 
 struct directory * root = NULL;
 
-static char version_string[] = "mkisofs v1.11.2";
+static char version_string[] = "mkisofs v1.11.3";
 
 FILE * discimage;
 unsigned int next_extent = 0;
diff --git a/gnu/usr.sbin/mkisofs/mkisofs.spec b/gnu/usr.sbin/mkisofs/mkisofs.spec
index 66e1e151263..aae8901ae0c 100644
--- a/gnu/usr.sbin/mkisofs/mkisofs.spec
+++ b/gnu/usr.sbin/mkisofs/mkisofs.spec
@@ -1,12 +1,12 @@
-#	$OpenBSD: mkisofs.spec,v 1.2 1998/04/05 00:39:37 deraadt Exp $
-# $From: mkisofs.spec,v 1.3 1997/04/10 02:46:57 eric Rel $
+#	$OpenBSD: mkisofs.spec,v 1.3 1999/11/29 21:53:15 d Exp $
+# $Id: mkisofs.spec,v 1.3 1999/11/29 21:53:15 d Exp $
 Summary: Creates a ISO9660 filesystem image
 Name: mkisofs
-Version: 1.11
+Version: 1.11.3
 Release: 1
 Copyright: GPL
 Group: Utilities/System
-Source: tsx-11.mit.edu:/pub/linux/packages/mkisofs/mkisofs-1.11.2.tar.gz
+Source: tsx-11.mit.edu:/pub/linux/packages/mkisofs/mkisofs-1.11.3.tar.gz
 
 %description
 This is the mkisofs package.  It is used to create ISO 9660
diff --git a/gnu/usr.sbin/mkisofs/multi.c b/gnu/usr.sbin/mkisofs/multi.c
index 80ebcd817a1..e1d4570ddd1 100644
--- a/gnu/usr.sbin/mkisofs/multi.c
+++ b/gnu/usr.sbin/mkisofs/multi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: multi.c,v 1.2 1998/04/05 00:39:38 deraadt Exp $	*/
+/*	$OpenBSD: multi.c,v 1.3 1999/11/29 21:53:15 d Exp $	*/
 /*
  * File multi.c - scan existing iso9660 image and merge into 
  * iso9660 filesystem.  Used for multisession support.
@@ -20,7 +20,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
  */
 
-static char rcsid[] ="$From: multi.c,v 1.4 1997/03/08 17:08:53 eric Rel $";
+static char rcsid[] ="$From: multi.c,v 1.6.1.3 1998/06/02 03:00:25 eric Exp $";
 
 #include <stdlib.h>
 #include <string.h>
@@ -909,6 +909,7 @@ FDECL2(merge_old_directory_into_tree, struct directory_entry *, dpnt,
   strcat(whole_path, SPATH_SEPARATOR);
   strcat(whole_path, dpnt->name);
   this_dir->de_name = strdup(whole_path);
+  this_dir->whole_name = strdup(whole_path);
 
   /*
    * Now fill this directory using information from the previous
diff --git a/gnu/usr.sbin/mkisofs/tree.c b/gnu/usr.sbin/mkisofs/tree.c
index 81742abc805..6b385a7359a 100644
--- a/gnu/usr.sbin/mkisofs/tree.c
+++ b/gnu/usr.sbin/mkisofs/tree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tree.c,v 1.2 1998/04/05 00:39:41 deraadt Exp $	*/
+/*	$OpenBSD: tree.c,v 1.3 1999/11/29 21:53:15 d Exp $	*/
 /*
  * File tree.c - scan directory  tree and build memory structures for iso9660
  * filesystem
@@ -21,7 +21,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-static char rcsid[] ="$From: tree.c,v 1.7 1997/03/25 03:55:28 eric Rel $";
+static char rcsid[] ="$From: tree.c,v 1.9.1.2 1998/06/02 03:17:31 eric Exp $";
 
 /* ADD_FILES changes made by Ross Biro biro@yggdrasil.com 2/23/95 */
 
@@ -1014,6 +1014,7 @@ FDECL3(scan_directory_tree,char *, path, struct directory_entry *, de,
 			 sizeof(struct directory_entry));
 		  s_entry1->table = NULL;
 		  s_entry1->name = strdup(this_dir->contents->name);
+		  s_entry1->whole_name = strdup(this_dir->contents->whole_name);
 		  s_entry1->next = reloc_dir->contents;
 		  reloc_dir->contents = s_entry1;
 		  s_entry1->priority  =  32768;