"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "xorriso/make_xorriso_1.c" between
xorriso-1.5.2.tar.gz and xorriso-1.5.4.tar.gz

About: GNU xorriso creates, loads, manipulates and writes ISO 9660 filesystem images with Rock Ridge extensions. It is suitable for incremental data backup and for production of bootable ISO 9660 images. GNU xorriso is a statical compilation of the libraries libburn, libisofs, libisoburn, and libjte.

make_xorriso_1.c  (xorriso-1.5.2):make_xorriso_1.c  (xorriso-1.5.4)
/* /*
( cd xorriso ; cc -g -Wall -o make_xorriso_1 make_xorriso_1.c ) ( cd xorriso ; cc -g -Wall -o make_xorriso_1 make_xorriso_1.c )
*/ */
/* /*
Specialized converter from xorriso/xorriso.texi to xorriso/xorriso.1, Specialized converter from xorriso/xorriso.texi to xorriso/xorriso.1,
or from xorriso/xorrisofs.texi to xorriso/xorrisofs.1, or from xorriso/xorrisofs.texi to xorriso/xorrisofs.1,
or from xorriso/xorrecord.texi to xorriso/xorrecord.1. or from xorriso/xorrecord.texi to xorriso/xorrecord.1.
or from xorriso/xorriso-tcltk.texi to xorriso/xorriso-tcltk.1. or from xorriso/xorriso-tcltk.texi to xorriso/xorriso-tcltk.1.
or from xorriso/xorriso-dd-target.texi to xorriso/xorriso-dd-target.1.
The conversion rules are described at the beginning of xorriso/xorriso.texi The conversion rules are described at the beginning of xorriso/xorriso.texi
Copyright 2010 - 2011 Thomas Schmitt, <scdbackup@gmx.net> Copyright 2010 - 2019 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later. Provided under GPL version 2 or later.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../config.h" #include "../config.h"
#endif #endif
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
skipping to change at line 182 skipping to change at line 183
return(ret); return(ret);
l= strlen(content); l= strlen(content);
} }
if((wpt - write_base) + l + strlen(front) + strlen(back) > 255) { if((wpt - write_base) + l + strlen(front) + strlen(back) > 255) {
Mx1_report_error(m, "Line length overflow while text substitution", 0); Mx1_report_error(m, "Line length overflow while text substitution", 0);
return(-1); return(-1);
} }
strcpy(wpt, front); strcpy(wpt, front);
wpt+= strlen(front); wpt+= strlen(front);
if(l > 0) if(l > 0)
strncpy(wpt, content, l); memcpy(wpt, content, l);
wpt+= l; wpt+= l;
strcpy(wpt, back); strcpy(wpt, back);
wpt+= strlen(back); wpt+= strlen(back);
(*read_pt)+= ept - rpt; (*read_pt)+= ept - rpt;
(*write_pt)= wpt; (*write_pt)= wpt;
return(1); return(1);
} }
/* @param flag bit0= recursion /* @param flag bit0= recursion
skipping to change at line 466 skipping to change at line 467
Mx1_init(&m, argv[0], 0); Mx1_init(&m, argv[0], 0);
if(argc < 2) { if(argc < 2) {
usage:; usage:;
fprintf(stderr, "usage: %s -auto|-filter [-xorrisofs]\n", argv[0]); fprintf(stderr, "usage: %s -auto|-filter [-xorrisofs]\n", argv[0]);
fprintf(stderr, " -auto xorriso/xorriso.texi -> xorriso/xorriso.1\n"); fprintf(stderr, " -auto xorriso/xorriso.texi -> xorriso/xorriso.1\n");
fprintf(stderr, " -filter stdin -> stdout\n"); fprintf(stderr, " -filter stdin -> stdout\n");
fprintf(stderr, " -xorrisofs process xorriso/xorrisofs.texi\n"); fprintf(stderr, " -xorrisofs process xorriso/xorrisofs.texi\n");
fprintf(stderr, " -xorrecord process xorriso/xorrecord.texi\n"); fprintf(stderr, " -xorrecord process xorriso/xorrecord.texi\n");
fprintf(stderr, " -xorriso-tcltk process xorriso/-xorriso-tcltk.texi\n"); fprintf(stderr, " -xorriso-tcltk process xorriso/-xorriso-tcltk.texi\n");
fprintf(stderr, " -xorriso-dd-target process xorriso/-xorriso-dd-target.tex i\n");
exit(2); exit(2);
} }
for(i= 1; i < argc; i++) { for(i= 1; i < argc; i++) {
if(strcmp(argv[i], "-filter") == 0) { if(strcmp(argv[i], "-filter") == 0) {
as_filter= 1; as_filter= 1;
} else if(strcmp(argv[i], "-auto") == 0) { } else if(strcmp(argv[i], "-auto") == 0) {
as_filter= 0; as_filter= 0;
} else if(strcmp(argv[i], "-xorrisofs") == 0) { } else if(strcmp(argv[i], "-xorrisofs") == 0) {
strcpy(name_in, "xorriso/xorrisofs.texi"); strcpy(name_in, "xorriso/xorrisofs.texi");
strcpy(name_out, "xorriso/xorrisofs.1"); strcpy(name_out, "xorriso/xorrisofs.1");
} else if(strcmp(argv[i], "-xorrecord") == 0) { } else if(strcmp(argv[i], "-xorrecord") == 0) {
strcpy(name_in, "xorriso/xorrecord.texi"); strcpy(name_in, "xorriso/xorrecord.texi");
strcpy(name_out, "xorriso/xorrecord.1"); strcpy(name_out, "xorriso/xorrecord.1");
} else if(strcmp(argv[i], "-xorriso-tcltk") == 0) { } else if(strcmp(argv[i], "-xorriso-tcltk") == 0) {
strcpy(name_in, "xorriso/xorriso-tcltk.texi"); strcpy(name_in, "xorriso/xorriso-tcltk.texi");
strcpy(name_out, "xorriso/xorriso-tcltk.1"); strcpy(name_out, "xorriso/xorriso-tcltk.1");
} else if(strcmp(argv[i], "-xorriso-dd-target") == 0) {
strcpy(name_in, "xorriso-dd-target/xorriso-dd-target.texi");
strcpy(name_out, "xorriso-dd-target/xorriso-dd-target.1");
} else { } else {
fprintf(stderr, "%s : unknown option %s\n", argv[0], argv[i]); fprintf(stderr, "%s : unknown option %s\n", argv[0], argv[i]);
goto usage; goto usage;
} }
} }
if(!as_filter) { if(!as_filter) {
fp_in= fopen(name_in, "r"); fp_in= fopen(name_in, "r");
if(fp_in == NULL) { if(fp_in == NULL) {
fprintf(stderr, "%s : failed to fopen( %s ,r) : %d %s\n", fprintf(stderr, "%s : failed to fopen( %s ,r) : %d %s\n",
 End of changes. 5 change blocks. 
2 lines changed or deleted 7 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)