Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/cdrtools/patches/write.c.patch
author Phi Tran <Phi.Tran@Sun.COM>
Fri, 01 Jul 2011 11:11:11 -0700
changeset 356 cc77dce0ea27
child 1072 75ddf7807870
permissions -rw-r--r--
PSARC/2011/154 mkisofs enhancements 7029174 mkisofs needs to support UEFI catalogue entry and setting modification time 7033042 migrate cdrtools to userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
356
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
     1
 
--- cdrtools-3.00/mkisofs/write.c.orig	Tue Jun 28 15:31:20 2011
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
     2
 
+++ cdrtools-3.00/mkisofs/write.c	Tue Jun 28 15:32:46 2011
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
     3
 
@@ -1978,6 +1978,7 @@
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
     4
 
 	int		i;
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
     5
 
 	int		s;
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
     6
 
 	Uchar		*cp;
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
     7
 
+	extern		char *modification_date;
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
     8
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
     9
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
    10
 
 	time(&begun);
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
    11
 
@@ -2079,7 +2080,11 @@
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
    12
 
 	FILL_SPACE(application_data);
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
    13
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
    14
 
 	memcpy(vol_desc.creation_date, iso_time, 17);
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
    15
 
-	memcpy(vol_desc.modification_date, iso_time, 17);
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
    16
 
+	if (modification_date == NULL) {
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
    17
 
+		memcpy(vol_desc.modification_date, iso_time, 17);
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
    18
 
+	} else {
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
    19
 
+		memcpy(vol_desc.modification_date, modification_date, 17);
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
    20
 
+	}
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
    21
 
 	memcpy(vol_desc.expiration_date, "0000000000000000", 17);
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
    22
 
 	memcpy(vol_desc.effective_date, iso_time, 17);
cc77dce0ea27 PSARC/2011/154 mkisofs enhancements
Phi Tran <Phi.Tran@Sun.COM>
parents:
diff changeset 
    23
upstream/oracle/userland-gate