head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.54 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.52 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.48 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.46 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2-base:1.3 netbsd-1-3-PATCH002:1.2 FreeBSD-current-1997-10-09:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.3 date 98.07.04.08.09.07; author mycroft; state dead; branches; next 1.2; 1.2 date 97.10.29.12.28.58; author agc; state Exp; branches; next 1.1; 1.1 date 97.10.29.11.45.08; author agc; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 97.10.29.11.45.08; author agc; state Exp; branches; next ; desc @@ 1.3 log @Update to 1.11.3. @ text @--- eltorito.c.orig Thu Apr 10 04:41:44 1997 +++ eltorito.c Wed Oct 29 12:13:33 1997 @@@@ -28,11 +28,14 @@@@ #include #include #include -#include +#include #include "mkisofs.h" #include "iso9660.h" +#undef MIN +#define MIN(a, b) (((a) < (b))? (a): (b)) + static struct eltorito_validation_entry valid_desc; static struct eltorito_defaultboot_entry default_desc; @@@@ -158,7 +161,7 @@@@ * but who really reads this stuff! */ if (publisher) - memcpy_max(valid_desc.id, publisher, strlen(publisher)); + memcpy_max(valid_desc.id, publisher, MIN(31, strlen(publisher))); valid_desc.key1[0] = 0x55; valid_desc.key2[0] = 0xAA; @ 1.2 log @Upgrade to mkisofs-1.11. Bring patches forward to newer version. @ text @@ 1.1 log @Initial revision @ text @d1 9 a9 3 --- eltorito.c.orig Mon May 5 15:46:11 1997 +++ eltorito.c Mon May 5 16:11:42 1997 @@@@ -33,6 +33,9 @@@@ @ 1.1.1.1 log @Initial import of mkisofs from FreeBSD ports collection into NetBSD package system. @ text @@