projects / packages / cdrtools.git / blame
| Commit | Line | Data |
|---|---|---|
| b2f9b8e5 AM |
1 | --- cdrtools-2.01/mkisofs/mkisofs.c.sopwith 2005-04-06 13:45:44.374388145 -0400 |
| 2 | +++ cdrtools-2.01/mkisofs/mkisofs.c 2005-04-06 13:51:59.163713250 -0400 | |
| 3 | @@ -129,7 +129,7 @@ | |
| 4 | int dirmode_to_use = 0; /* if non-zero, when rationalizing dir mode */ | |
| 5 | int new_dir_mode = 0555; | |
| 6 | int generate_tables = 0; | |
| 7 | -int dopad = 1; /* Now default to do padding */ | |
| 8 | +int dopad = 1, padsize=150; /* Now default to do padding */ | |
| 9 | int print_size = 0; | |
| 10 | int split_output = 0; | |
| 11 | char *icharset = NULL; /* input charset to convert to UNICODE */ | |
| 12 | @@ -375,6 +375,7 @@ | |
| 13 | ||
| 14 | #define OPTION_ALLOW_LEADING_DOTS 1070 | |
| 15 | #define OPTION_PUBLISHER 1071 | |
| 16 | +#define OPTION_PAD_SIZE 1072 | |
| 17 | ||
| 18 | #ifdef UDF | |
| 19 | #define OPTION_UDF 1500 | |
| 20 | @@ -563,6 +564,8 @@ | |
| 21 | 0, NULL, "Pad output to a multiple of 32k (default)", ONE_DASH}, | |
| 22 | {{"no-pad", no_argument, NULL, OPTION_NOPAD}, | |
| 23 | 0, NULL, "Do not pad output to a multiple of 32k", ONE_DASH}, | |
| 24 | + {{"pad-size", required_argument, NULL, OPTION_PAD_SIZE}, | |
| 25 | + 0, "SIZE", "Pad output to a multiple of SIZE kilobytes", ONE_DASH}, | |
| 26 | {{"prev-session", required_argument, NULL, 'M'}, | |
| 27 | 'M', "FILE", "Set path to previous session to merge", ONE_DASH}, | |
| 28 | {{"dev", required_argument, NULL, 'M'}, | |
| 29 | @@ -1596,6 +1599,9 @@ | |
| 30 | case OPTION_NOPAD: | |
| 31 | dopad = 0; | |
| 32 | break; | |
| 33 | + case OPTION_PAD_SIZE: | |
| 34 | + padsize = atoi(optarg); | |
| 35 | + break; | |
| 36 | case OPTION_P_LIST: | |
| 37 | pathnames = optarg; | |
| 38 | break; | |
| 39 | --- cdrtools-2.01/mkisofs/stream.c.sopwith 2005-04-06 13:49:45.432343629 -0400 | |
| 40 | +++ cdrtools-2.01/mkisofs/stream.c 2005-04-06 13:50:44.995801016 -0400 | |
| 41 | @@ -64,6 +64,7 @@ | |
| 42 | { | |
| 43 | int n; | |
| 44 | extern int dopad; | |
| 45 | +extern int padsize; | |
| 46 | ||
| 47 | stream_extent = last_extent; /* Start of stream file content */ | |
| 48 | ||
| 49 | @@ -76,7 +77,7 @@ | |
| 50 | n = 50; /* Make net. size easy to compute */ | |
| 51 | } | |
| 52 | if (dopad) | |
| 53 | - n += 150; /* Room for final padding */ | |
| 54 | + n += padsize; /* Room for final padding */ | |
| 55 | avail_extent -= n; | |
| 56 | ||
| 57 | last_extent += avail_extent + stream_pad; |