Changed -du_s* into -dus*

This commit is contained in:
Thomas Schmitt 2007-12-20 11:14:49 +00:00
parent 1605300dba
commit 7c79807221
5 changed files with 55 additions and 58 deletions

View File

@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps .\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1) .\" 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. .\" Please adjust this date whenever revising the manpage.
.\" .\"
.\" Some roff macros, for reference: .\" Some roff macros, for reference:
@ -731,6 +731,16 @@ It also disables -disk_pattern expansion for command -add.
"off" disables pathspecs of the form target=source "off" disables pathspecs of the form target=source
and eventually enables -disk_pattern expansion. and eventually enables -disk_pattern expansion.
.TP .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: .B Settings for result writing:
.TP .TP
Rock Ridge info will be generated by the program unconditionally. Rock Ridge info will be generated by the program unconditionally.
@ -806,16 +816,6 @@ Event messages are sent to the info channel "I" which is usually stderr
but may be influenced by command -pkt_output. but may be influenced by command -pkt_output.
Info messages which belong to no event get attributed severity "NOTE". Info messages which belong to no event get attributed severity "NOTE".
.TP .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: .B Dialog mode control:
.TP .TP
\fB\-dialog\fR "on"|"off" \fB\-dialog\fR "on"|"off"
@ -958,12 +958,12 @@ similar to shell command du -k.
Recursively list size of directories and files in the local filesystem Recursively list size of directories and files in the local filesystem
which match one of the patterns, similar to shell command du -k. which match one of the patterns, similar to shell command du -k.
.TP .TP
\fB\-du_s\fR iso_rr_pattern [***] \fB\-dus\fR iso_rr_pattern [***]
List size of directories and files in the ISO image List size of directories and files in the ISO image
which match one of the patterns. which match one of the patterns.
Similar to shell command du -sk. Similar to shell command du -sk.
.TP .TP
\fB\-du_sx\fR disk_pattern [***] \fB\-dusx\fR disk_pattern [***]
List size of directories and files in the local filesystem List size of directories and files in the local filesystem
which match one of the patterns. which match one of the patterns.
Similar to shell command du -sk. Similar to shell command du -sk.
@ -1087,16 +1087,16 @@ session to media.
-blank fast \\ -blank fast \\
-pathspecs on \\ -pathspecs on \\
-add \\ -add \\
/sounds=/home/me/sounds \\ /sounds=/home/me/sounds \\
/pictures \\ /pictures \\
-- \\ -- \\
-rm_r \\ -rm_r \\
/sounds/indecent \\ /sounds/indecent \\
'/pictures/*private*' \\ '/pictures/*private*' \\
/pictures/confidential \\ /pictures/confidential \\
-- \\ -- \\
-add \\ -add \\
/pictures/confidential/work* /pictures/confidential/work*
.br .br
Note that '/pictures/*private*' is a pattern for iso_rr_paths Note that '/pictures/*private*' is a pattern for iso_rr_paths
while /pictures/confidential/work* gets expanded by the shell 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 \\ \fB$\fR xorriso -dev /dev/sr2 \\
-rm_r /sounds -- \\ -rm_r /sounds -- \\
-mv \\ -mv \\
/pictures/confidential \\ /pictures/confidential \\
/pictures/restricted \\ /pictures/restricted \\
-- \\ -- \\
-chmod go-rwx /pictures/restricted -- \\ -chmod go-rwx /pictures/restricted -- \\
-pathsspecs on \\ -pathsspecs on \\
-add \\ -add \\
/sounds=/home/me/prepared_for_dvd/sounds_dummy \\ /sounds=/home/me/prepared_for_dvd/sounds_dummy \\
/movies=/home/me/prepared_for_dvd/movies \\ /movies=/home/me/prepared_for_dvd/movies \\
-- \\ -- \\
-commit -eject all -commit -eject all
.SS .SS
.B Copy modified ISO image from one media to another .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 \\ \fB$\fR xorriso -indev /dev/sr2 \\
-rm_r /sounds -- \\ -rm_r /sounds -- \\
... ...
/movies=/home/me/prepared_for_dvd/movies \\ -outdev /dev/sr0 -blank fast \\
-- \\
-outdev /dev/sr0 \\
-blank fast \\
-commit -eject all -commit -eject all
.SS .SS
.B Examples of input timestrings .B Examples of input timestrings

View File

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

View File

@ -228,24 +228,26 @@ int Xorriso_option_history(struct XorrisO *xorriso, char *line, int flag);
/* Option -J */ /* Option -J */
int Xorriso_option_j_capital(struct XorrisO *xorriso, int flag); 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)
bit1= do not expand patterns but use literally
bit2= du rather than ls
*/
int Xorriso_option_lsi(struct XorrisO *xorriso, int argc, char **argv,
int *idx, int flag);
/* Option -logfile */ /* Option -logfile */
int Xorriso_option_logfile(struct XorrisO *xorriso, char *channel, int Xorriso_option_logfile(struct XorrisO *xorriso, char *channel,
char *fileadr, int flag); char *fileadr, int flag);
/* Options -lsx , -ls_lx , /* Options -ls alias -lsi and -lsl alias -lsli
-dux , -du_sx and -lsd alias -lsdi and -lsdl alias -lsdli
@param flag bit0= long format (-ls_lx , -dux) and -du alias -dui and -dus alias -dusi
@param flag bit0= long format (-lsl , -du)
bit1= do not expand patterns but use literally bit1= do not expand patterns but use literally
bit2= du rather than ls 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);
/* 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 Xorriso_option_lsx(struct XorrisO *xorriso, int argc, char **argv,
int *idx, int flag); int *idx, int flag);

View File

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

View File

@ -2152,7 +2152,7 @@ int Xorriso_ls_filev(struct XorrisO *xorriso, char *wd,
(struct iso_tree_node_symlink *) node), 0)<=0) (struct iso_tree_node_symlink *) node), 0)<=0)
link_target[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; size= stbuf.st_size;
if(S_ISDIR(stbuf.st_mode)) { if(S_ISDIR(stbuf.st_mode)) {
ret= Xorriso_show_du_subs(xorriso, (struct iso_tree_node_dir *) node, ret= Xorriso_show_du_subs(xorriso, (struct iso_tree_node_dir *) node,