Changed -du_s* into -dus*

master
Thomas Schmitt 15 years ago
parent 1605300dba
commit 7c79807221
  1. 59
      test/xorriso.1
  2. 24
      test/xorriso.c
  3. 22
      test/xorriso.h
  4. 2
      test/xorriso_timestamp.h
  5. 2
      test/xorrisoburn.c

@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH XORRISO 1 "December 18, 2007"
.TH XORRISO 1 "December 19, 2007"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@ -730,6 +730,16 @@ It also disables -disk_pattern expansion for command -add.
.br
"off" disables pathspecs of the form target=source
and eventually enables -disk_pattern expansion.
.TP
\fB\-overwrite\fR "on"|"nondir"|"off"
Allow or disallow to overwrite existing files in the
ISO image by files with the same user defined name.
.br
With setting "off", name collisions cause SORRY-events.
With setting "nondir", only directories are protected by such events, other
existing file types get treated with -rm before the new file gets added.
Setting "on" allows automatic -rm_r. I.e. a non-directory can replace an
existing directory and all its subordinates.
.TP
.B Settings for result writing:
.TP
@ -805,16 +815,6 @@ reach the severity threshold of -abort_on .
Event messages are sent to the info channel "I" which is usually stderr
but may be influenced by command -pkt_output.
Info messages which belong to no event get attributed severity "NOTE".
.TP
\fB\-overwrite\fR "on"|"nondir"|"off"
Allow or disallow to overwrite existing files in the
ISO image by files with the same user defined name.
.br
With setting "off", name collisions cause SORRY-events.
With setting "nondir", only directories are protected by such events, other
existing file types get treated with -rm before the new file gets added.
Setting "on" allows automatic -rm_r. I.e. a non-directory can replace an
existing directory and all its subordinates.
.TP
.B Dialog mode control:
.TP
@ -958,12 +958,12 @@ similar to shell command du -k.
Recursively list size of directories and files in the local filesystem
which match one of the patterns, similar to shell command du -k.
.TP
\fB\-du_s\fR iso_rr_pattern [***]
\fB\-dus\fR iso_rr_pattern [***]
List size of directories and files in the ISO image
which match one of the patterns.
Similar to shell command du -sk.
.TP
\fB\-du_sx\fR disk_pattern [***]
\fB\-dusx\fR disk_pattern [***]
List size of directories and files in the local filesystem
which match one of the patterns.
Similar to shell command du -sk.
@ -1087,16 +1087,16 @@ session to media.
-blank fast \\
-pathspecs on \\
-add \\
/sounds=/home/me/sounds \\
/pictures \\
-- \\
/sounds=/home/me/sounds \\
/pictures \\
-- \\
-rm_r \\
/sounds/indecent \\
'/pictures/*private*' \\
/pictures/confidential \\
-- \\
/sounds/indecent \\
'/pictures/*private*' \\
/pictures/confidential \\
-- \\
-add \\
/pictures/confidential/work*
/pictures/confidential/work*
.br
Note that '/pictures/*private*' is a pattern for iso_rr_paths
while /pictures/confidential/work* gets expanded by the shell
@ -1155,15 +1155,15 @@ Add new directory trees /sounds and /movies. Burn to the same media and eject.
\fB$\fR xorriso -dev /dev/sr2 \\
-rm_r /sounds -- \\
-mv \\
/pictures/confidential \\
/pictures/restricted \\
-- \\
/pictures/confidential \\
/pictures/restricted \\
-- \\
-chmod go-rwx /pictures/restricted -- \\
-pathsspecs on \\
-add \\
/sounds=/home/me/prepared_for_dvd/sounds_dummy \\
/movies=/home/me/prepared_for_dvd/movies \\
-- \\
/sounds=/home/me/prepared_for_dvd/sounds_dummy \\
/movies=/home/me/prepared_for_dvd/movies \\
-- \\
-commit -eject all
.SS
.B Copy modified ISO image from one media to another
@ -1174,10 +1174,7 @@ first and only session to the output drive.
\fB$\fR xorriso -indev /dev/sr2 \\
-rm_r /sounds -- \\
...
/movies=/home/me/prepared_for_dvd/movies \\
-- \\
-outdev /dev/sr0 \\
-blank fast \\
-outdev /dev/sr0 -blank fast \\
-commit -eject all
.SS
.B Examples of input timestrings

@ -5137,7 +5137,7 @@ int Xorriso_lsx_filev(struct XorrisO *xorriso, char *wd,
if(ret<=0)
link_target[0]= 0;
}
} else if(flag&4) { /* -du or -du_s */
} else if(flag&4) { /* -du or -dus */
size= stbuf.st_size;
if(S_ISDIR(stbuf.st_mode)) {
ret= Xorriso_show_dux_subs(xorriso, path, filev[i], &size, boss_mem,
@ -6259,14 +6259,12 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
"",
" -du pattern [***] recursively lists sizes of files or directories in the",
" ISO image which match one of the shell parser patterns.",
" -dui pattern [***] same as -du.",
" -dux pattern [***] recursively lists sizes of files or directories in the",
" local filesystem which match one of the shell parser",
" patterns.",
" -du_s pattern [***] like -du but summing up subdirectories without",
" -dus pattern [***] like -du but summing up subdirectories without",
" listing them explicitely.",
" -du_si pattern [***] same as -du_s.",
" -du_sx pattern [***] like -dux but summing up subdirectories without",
" -dusx pattern [***] like -dux but summing up subdirectories without",
" listing them explicitely.",
"",
"> -find pattern lists matching files below current working directory in",
@ -6393,9 +6391,10 @@ int Xorriso_option_j_capital(struct XorrisO *xorriso, int flag)
}
/* Options -ls alias -lsi and -ls_l alias -ls_li
and -du alias -dui and -du_s alias -du_si
@param flag bit0= long format (-ls_l , -du)
/* Options -ls alias -lsi and -lsl alias -lsli
and -lsd alias -lsdi and -lsdl alias -lsdli
and -du alias -dui and -dus alias -dusi
@param flag bit0= long format (-lsl , -du)
bit1= do not expand patterns but use literally
bit2= du rather than ls
bit3= list directories as themselves (ls -d)
@ -6464,9 +6463,8 @@ ex:;
}
/* Options -lsdx , -lsdlx ,
-dux , -du_sx
@param flag bit0= long format (-ls_lx , -dux)
/* Options -lsx, -lslx, -lsdx , -lsdlx , -dux , -dusx
@param flag bit0= long format (-lslx , -dux)
bit1= do not expand patterns but use literally
bit2= du rather than ls
bit3= list directories as themselves (ls -d)
@ -7462,10 +7460,10 @@ next_command:;
ret= Xorriso_option_disk_pattern(xorriso, arg1, 0);
} else if(strcmp(cmd,"du")==0 || strcmp(cmd,"dui")==0 ||
strcmp(cmd,"du_s")==0 || strcmp(cmd,"du_si")==0) {
strcmp(cmd,"dus")==0 || strcmp(cmd,"dusi")==0) {
ret= Xorriso_option_lsi(xorriso, argc, argv, idx, (strlen(cmd)<4)|4);
} else if(strcmp(cmd,"dux")==0 || strcmp(cmd,"du_sx")==0) {
} else if(strcmp(cmd,"dux")==0 || strcmp(cmd,"dusx")==0) {
ret= Xorriso_option_lsx(xorriso, argc, argv, idx, (strlen(cmd)<4)|4);
} else if(strcmp(cmd,"eject")==0) {

@ -228,24 +228,26 @@ int Xorriso_option_history(struct XorrisO *xorriso, char *line, int flag);
/* Option -J */
int Xorriso_option_j_capital(struct XorrisO *xorriso, int flag);
/* Options -ls alias -lsi and -ls_l alias -ls_li
and -du alias -dui and -du_s alias -du_si
@param flag bit0= long format (-ls_l , -du)
/* Option -logfile */
int Xorriso_option_logfile(struct XorrisO *xorriso, char *channel,
char *fileadr, int flag);
/* Options -ls alias -lsi and -lsl alias -lsli
and -lsd alias -lsdi and -lsdl alias -lsdli
and -du alias -dui and -dus alias -dusi
@param flag bit0= long format (-lsl , -du)
bit1= do not expand patterns but use literally
bit2= du rather than ls
bit3= list directories as themselves (ls -d)
*/
int Xorriso_option_lsi(struct XorrisO *xorriso, int argc, char **argv,
int *idx, int flag);
/* Option -logfile */
int Xorriso_option_logfile(struct XorrisO *xorriso, char *channel,
char *fileadr, int flag);
/* Options -lsx , -ls_lx ,
-dux , -du_sx
@param flag bit0= long format (-ls_lx , -dux)
/* Options -lsx, -lslx, -lsdx , -lsdlx , -dux , -dusx
@param flag bit0= long format (-lslx , -dux)
bit1= do not expand patterns but use literally
bit2= du rather than ls
bit3= list directories as themselves (ls -d)
*/
int Xorriso_option_lsx(struct XorrisO *xorriso, int argc, char **argv,
int *idx, int flag);

@ -1 +1 @@
#define Xorriso_timestamP "2007.12.18.175924"
#define Xorriso_timestamP "2007.12.20.111338"

@ -2152,7 +2152,7 @@ int Xorriso_ls_filev(struct XorrisO *xorriso, char *wd,
(struct iso_tree_node_symlink *) node), 0)<=0)
link_target[0]= 0;
}
} else if(flag&4) { /* -du or -du_s */
} else if(flag&4) { /* -du or -dus */
size= stbuf.st_size;
if(S_ISDIR(stbuf.st_mode)) {
ret= Xorriso_show_du_subs(xorriso, (struct iso_tree_node_dir *) node,

Loading…
Cancel
Save