head 1.2; access; symbols OPENPKG_E1_MP_HEAD:1.2 OPENPKG_E1_MP:1.2 OPENPKG_E1_MP_2_STABLE:1.2 OPENPKG_E1_FP:1.2 OPENPKG_2_STABLE_20061018:1.2 OPENPKG_2_STABLE:1.2.0.20 OPENPKG_2_STABLE_BP:1.2 OPENPKG_2_5_SOLID:1.2.0.18 OPENPKG_2_5_SOLID_BP:1.2 OPENPKG_2_4_RELEASE:1.2 OPENPKG_2_4_SOLID:1.2.0.16 OPENPKG_2_4_SOLID_BP:1.2 OPENPKG_2_3_RELEASE:1.2 OPENPKG_2_3_SOLID:1.2.0.14 OPENPKG_2_3_SOLID_BP:1.2 OPENPKG_2_2_RELEASE:1.2 OPENPKG_2_2_SOLID:1.2.0.12 OPENPKG_2_2_SOLID_BP:1.2 OPENPKG_2_1_RELEASE:1.2 OPENPKG_2_1_SOLID:1.2.0.10 OPENPKG_2_1_SOLID_BP:1.2 OPENPKG_2_0_RELEASE:1.2 OPENPKG_2_0_SOLID:1.2.0.8 OPENPKG_2_0_SOLID_BP:1.2 OPENPKG_1_3_RELEASE:1.2 OPENPKG_1_3_SOLID:1.2.0.6 OPENPKG_1_3_SOLID_BP:1.2 OPENPKG_1_2_SOLID:1.2.0.4 OPENPKG_1_2_SOLID_BP:1.2 OPENPKG_1_STABLE:1.2.0.2 OPENPKG_1_STABLE_BP:1.2 OPENPKG_1_0_RELEASE:1.1.1.1 OPENPKG_1_0_SOLID:1.1.1.1.0.2 OPENPKG_1_0_SOLID_BP:1.1.1.1 OPENPKG_0_0:1.1.1.1 OPENPKG:1.1.1; locks; strict; comment @# @; 1.2 date 2002.03.15.16.49.41; author rse; state dead; branches; next 1.1; 1.1 date 2001.09.18.09.48.30; author rse; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.09.18.09.48.30; author rse; state Exp; branches; next ; desc @@ 1.2 log @upgrade to mkisofs 1.14 (from cdrtools 1.10) @ text @--- include/schily.h.orig Mon Aug 30 16:50:46 1999 +++ include/schily.h Sat Sep 18 17:25:57 1999 @@@@ -34,7 +34,7 @@@@ #define _SCHILY_H #ifndef _STANDARD_H -#include +#include #endif #if defined(_SIZE_T) || defined(_T_SIZE_) || defined(_T_SIZE) || \ --- lib/cvt.c.orig Wed Sep 8 15:03:20 1999 +++ lib/cvt.c Sun Feb 25 10:06:50 2001 @@@@ -31,7 +31,7 @@@@ #include #ifdef HAVE_DTOA /* 4.4BSD floating point implementation */ -extern char *__dtoa __PR((double value, int mode, int ndigit, int *decpt, int *sign, char **ep)); +extern char *__dtoa __PR((double value, int mode, int ndigit, int *decpt, int *sign, char **ep, char **resultp)); #endif #ifndef HAVE_ECVT @@@@ -57,7 +57,13 @@@@ static char *buf; char *bufend; char *ep; - char *bp = __dtoa(value, 2, ndigit, decpt, sign, &ep); + char *bp; + static char *dtoaresult = NULL; + + free(dtoaresult); + dtoaresult = NULL; + + bp = __dtoa(value, 2, ndigit, decpt, sign, &ep, &dtoaresult); if (value == 0.0) { /* @@@@ -102,7 +108,13 @@@@ static char *buf; char *bufend; char *ep; - char *bp = __dtoa(value, 3, ndigit, decpt, sign, &ep); + char *bp; + static char *dtoaresult = NULL; + + free(dtoaresult); + dtoaresult = NULL; + + bp = __dtoa(value, 3, ndigit, decpt, sign, &ep, &dtoaresult); if (value == 0.0) { /* --- mkisofs/tree.c.orig Thu Apr 27 11:44:57 2000 +++ mkisofs/tree.c Sat Apr 29 11:34:23 2000 @@@@ -538,8 +538,8 @@@@ table->de_flags |= INHIBIT_JOLIET_ENTRY; /* table->name = strdup("");*/ table->name = strdup(trans_tbl); - table->table = (char *) e_malloc(ISO_ROUND_UP(tablesize)); - memset(table->table, 0, ISO_ROUND_UP(tablesize)); + table->table = (char *) e_malloc(ISO_ROUND_UP(tablesize+1)); + memset(table->table, 0, ISO_ROUND_UP(tablesize+1)); iso9660_file_length(trans_tbl, table, 0); if (use_RockRidge) { --- mkisofs/modes.c.orig Sun May 7 14:49:37 2000 +++ mkisofs/modes.c Thu Aug 17 21:02:57 2000 @@@@ -58,7 +58,7 @@@@ int hdlen; int len = 1; /* Nach SCSI Norm */ int try = 0; - struct scsi_mode_page_header *mp; + struct scg_scsi_mode_page_header *mp; again: fillbytes((caddr_t)mode, sizeof(mode), '\0'); @@@@ -77,7 +77,7 @@@@ scgp->silent--; return (FALSE); } else { - len = ((struct scsi_mode_header *)mode)->sense_data_len + 1; + len = ((struct scg_scsi_mode_header *)mode)->sense_data_len + 1; } if (mode_sense(scgp, mode, len, page, 0) < 0) { /* Page n current */ scgp->silent--; @@@@ -87,9 +87,9 @@@@ if (scgp->verbose) scsiprbytes("Mode Sense Data", mode, len - scsigetresid(scgp)); - hdlen = sizeof(struct scsi_mode_header) + - ((struct scsi_mode_header *)mode)->blockdesc_len; - mp = (struct scsi_mode_page_header *)(mode + hdlen); + hdlen = sizeof(struct scg_scsi_mode_header) + + ((struct scg_scsi_mode_header *)mode)->blockdesc_len; + mp = (struct scg_scsi_mode_page_header *)(mode + hdlen); if (scgp->verbose) scsiprbytes("Mode Page Data", (u_char *)mp, mp->p_len+2); @@@@ -223,7 +223,7 @@@@ ((struct scsi_modesel_header *)modep)->sense_data_len = 0; ((struct scsi_modesel_header *)modep)->res2 = 0; - i = ((struct scsi_mode_header *)modep)->blockdesc_len; + i = ((struct scg_scsi_mode_header *)modep)->blockdesc_len; if (i > 0) { i_to_3_byte( ((struct scsi_mode_data *)modep)->blockdesc.nlblock, --- libscg/scg/scsireg.h.orig Sun May 28 23:31:20 2000 +++ libscg/scg/scsireg.h Thu Aug 17 20:31:45 2000 @@@@ -170,7 +170,7 @@@@ #if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */ -struct scsi_mode_header { +struct scg_scsi_mode_header { Ucbit sense_data_len : 8; u_char medium_type; Ucbit res2 : 4; @@@@ -182,7 +182,7 @@@@ #else /* Motorola byteorder */ -struct scsi_mode_header { +struct scg_scsi_mode_header { Ucbit sense_data_len : 8; u_char medium_type; Ucbit write_prot : 1; @@@@ -244,7 +244,7 @@@@ #if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */ -struct scsi_mode_page_header { +struct scg_scsi_mode_page_header { Ucbit p_code : 6; Ucbit res : 1; Ucbit parsave : 1; @@@@ -262,7 +262,7 @@@@ #else /* Motorola byteorder */ -struct scsi_mode_page_header { +struct scg_scsi_mode_page_header { Ucbit parsave : 1; Ucbit res : 1; Ucbit p_code : 6; @@@@ -988,7 +988,7 @@@@ struct scsi_mode_data { - struct scsi_mode_header header; + struct scg_scsi_mode_header header; struct scsi_mode_blockdesc blockdesc; union pagex { struct acb_mode_data acb; --- mkisofs/scsi_cdr.c.orig Sun Jul 2 23:11:23 2000 +++ mkisofs/scsi_cdr.c Thu Aug 17 21:02:04 2000 @@@@ -1791,7 +1791,7 @@@@ int secsize; { struct scsi_mode_data md; - int count = sizeof(struct scsi_mode_header) + + int count = sizeof(struct scg_scsi_mode_header) + sizeof(struct scsi_mode_blockdesc); (void)test_unit_ready(scgp); /* clear any error situation */ @@@@ -2462,8 +2462,8 @@@@ return (NULL); mp = (struct cd_mode_page_2A *) - (mode + sizeof(struct scsi_mode_header) + - ((struct scsi_mode_header *)mode)->blockdesc_len); + (mode + sizeof(struct scg_scsi_mode_header) + + ((struct scg_scsi_mode_header *)mode)->blockdesc_len); /* * Do some heuristics against pre SCSI-3/mmc VU page 2A @@@@ -2481,8 +2481,8 @@@@ if (val != 0 && val < 176) return (NULL); - len -= sizeof(struct scsi_mode_header) + - ((struct scsi_mode_header *)mode)->blockdesc_len; + len -= sizeof(struct scg_scsi_mode_header) + + ((struct scg_scsi_mode_header *)mode)->blockdesc_len; if (modep) mp2 = (struct cd_mode_page_2A *)modep; else @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Import OpenPKG sources into CVS repository @ text @@