Changeset 3150 in MondoRescue for branches/3.0/mondo/src/common/libmondo-cli.c
- Timestamp:
- Jun 21, 2013, 6:48:23 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.0/mondo/src/common/libmondo-cli.c
r3141 r3150 86 86 flag_set[i] = FALSE; 87 87 } 88 for (j = 1; j <= MAX_NOOF_MEDIA; j++) { 89 bkpinfo->media_size[j] = 650; 90 } /* default */ 91 res = 92 retrieve_switches_from_command_line(argc, argv, flag_val, 93 flag_set); 88 bkpinfo->media_size = 650; /* default */ 89 res = retrieve_switches_from_command_line(argc, argv, flag_val, flag_set); 94 90 retval += res; 95 91 if (!retval) { … … 145 141 assert(value != NULL); 146 142 147 bkpinfo->media_size[0] = -1; /* dummy value */ 148 for (j = 1, p = value; j < MAX_NOOF_MEDIA && strchr(p, ','); 149 j++, p = strchr(p, ',') + 1) { 150 strncpy(tmp, p, MAX_STR_LEN); 151 *(strchr(tmp, ',')) = '\0'; 152 bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp); 153 sprintf(comment, "media_size[%d] = %ld", j, 154 bkpinfo->media_size[j]); 155 log_msg(3, comment); 156 } 157 for (; j <= MAX_NOOF_MEDIA; j++) { 158 bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(p); 159 } 160 // bkpinfo->media_size[0] = bkpinfo->media_size[MAX_NOOF_MEDIA]; 161 for (j = 1; j <= MAX_NOOF_MEDIA; j++) { 162 if (bkpinfo->media_size[j] <= 0) { 163 log_msg(1, "You gave media #%d an invalid size\n", j); 164 return (-1); 165 } 143 bkpinfo->media_size = -1; /* dummy value */ 144 bkpinfo->media_size = friendly_sizestr_to_sizelong(p); 145 log_msg(3, "media_size = %ld", bkpinfo->media_size); 146 if (bkpinfo->media_size <= 0) { 147 log_msg(1, "You gave media an invalid size %s\n", p); 148 return (-1); 166 149 } 167 150 return (0); … … 461 444 } 462 445 } else if (flag_set['u'] || flag_set['t']) { 463 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 464 bkpinfo->media_size[i] = 0; 465 } 446 bkpinfo->media_size = 0; 466 447 } else { 467 448 retval++;
Note:
See TracChangeset
for help on using the changeset viewer.