libburnia/libisoburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Curbed the number of wildcard warnings to 3 for iso and 3 for disk

Browse Source
This commit is contained in:
Thomas Schmitt 2013-01-13 09:32:13 +00:00
parent caca17f3d5
commit 077309af3e
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xorriso/match.c
View File

@ -1,7 +1,7 @@
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net> Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later. Provided under GPL version 2 or later.
@ -753,8 +753,19 @@ ex:;
*/ */
int Xorriso_warn_of_wildcards(struct XorrisO *xorriso, char *path, int flag) int Xorriso_warn_of_wildcards(struct XorrisO *xorriso, char *path, int flag)
{ {
static int count_iso= 0, count_disk= 0, max_iso= 3, max_disk= 3;
if(strchr(path,'*')!=NULL || strchr(path,'?')!=NULL || if(strchr(path,'*')!=NULL || strchr(path,'?')!=NULL ||
strchr(path,'[')!=NULL) { strchr(path,'[')!=NULL) {
if(flag & 2) {
count_disk++;
if(count_disk > max_disk)
return(1);
} else {
count_iso++;
if(count_iso > max_iso)
return(1);
}
if(flag&1) { if(flag&1) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Pattern expansion of wildcards \"*?[\" does not apply to this command"); "Pattern expansion of wildcards \"*?[\" does not apply to this command");

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2013.01.09.101831" #define Xorriso_timestamP "2013.01.13.093116"