diff options
-rwxr-xr-x | configure | 14 | ||||
-rw-r--r-- | src/firejail/output.c | 3 |
2 files changed, 3 insertions, 14 deletions
@@ -682,7 +682,6 @@ infodir | |||
682 | docdir | 682 | docdir |
683 | oldincludedir | 683 | oldincludedir |
684 | includedir | 684 | includedir |
685 | runstatedir | ||
686 | localstatedir | 685 | localstatedir |
687 | sharedstatedir | 686 | sharedstatedir |
688 | sysconfdir | 687 | sysconfdir |
@@ -775,7 +774,6 @@ datadir='${datarootdir}' | |||
775 | sysconfdir='${prefix}/etc' | 774 | sysconfdir='${prefix}/etc' |
776 | sharedstatedir='${prefix}/com' | 775 | sharedstatedir='${prefix}/com' |
777 | localstatedir='${prefix}/var' | 776 | localstatedir='${prefix}/var' |
778 | runstatedir='${localstatedir}/run' | ||
779 | includedir='${prefix}/include' | 777 | includedir='${prefix}/include' |
780 | oldincludedir='/usr/include' | 778 | oldincludedir='/usr/include' |
781 | docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' | 779 | docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' |
@@ -1028,15 +1026,6 @@ do | |||
1028 | | -silent | --silent | --silen | --sile | --sil) | 1026 | | -silent | --silent | --silen | --sile | --sil) |
1029 | silent=yes ;; | 1027 | silent=yes ;; |
1030 | 1028 | ||
1031 | -runstatedir | --runstatedir | --runstatedi | --runstated \ | ||
1032 | | --runstate | --runstat | --runsta | --runst | --runs \ | ||
1033 | | --run | --ru | --r) | ||
1034 | ac_prev=runstatedir ;; | ||
1035 | -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ | ||
1036 | | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ | ||
1037 | | --run=* | --ru=* | --r=*) | ||
1038 | runstatedir=$ac_optarg ;; | ||
1039 | |||
1040 | -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) | 1029 | -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) |
1041 | ac_prev=sbindir ;; | 1030 | ac_prev=sbindir ;; |
1042 | -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | 1031 | -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ |
@@ -1174,7 +1163,7 @@ fi | |||
1174 | for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ | 1163 | for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ |
1175 | datadir sysconfdir sharedstatedir localstatedir includedir \ | 1164 | datadir sysconfdir sharedstatedir localstatedir includedir \ |
1176 | oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ | 1165 | oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ |
1177 | libdir localedir mandir runstatedir | 1166 | libdir localedir mandir |
1178 | do | 1167 | do |
1179 | eval ac_val=\$$ac_var | 1168 | eval ac_val=\$$ac_var |
1180 | # Remove trailing slashes. | 1169 | # Remove trailing slashes. |
@@ -1327,7 +1316,6 @@ Fine tuning of the installation directories: | |||
1327 | --sysconfdir=DIR read-only single-machine data [PREFIX/etc] | 1316 | --sysconfdir=DIR read-only single-machine data [PREFIX/etc] |
1328 | --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] | 1317 | --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] |
1329 | --localstatedir=DIR modifiable single-machine data [PREFIX/var] | 1318 | --localstatedir=DIR modifiable single-machine data [PREFIX/var] |
1330 | --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] | ||
1331 | --libdir=DIR object code libraries [EPREFIX/lib] | 1319 | --libdir=DIR object code libraries [EPREFIX/lib] |
1332 | --includedir=DIR C header files [PREFIX/include] | 1320 | --includedir=DIR C header files [PREFIX/include] |
1333 | --oldincludedir=DIR C header files for non-gcc [/usr/include] | 1321 | --oldincludedir=DIR C header files for non-gcc [/usr/include] |
diff --git a/src/firejail/output.c b/src/firejail/output.c index f7e6856dd..b92615f88 100644 --- a/src/firejail/output.c +++ b/src/firejail/output.c | |||
@@ -122,7 +122,8 @@ void check_output(int argc, char **argv) { | |||
122 | } | 122 | } |
123 | bool found_separator = false; | 123 | bool found_separator = false; |
124 | /* copy argv into args, but drop --output(-stderr) arguments */ | 124 | /* copy argv into args, but drop --output(-stderr) arguments */ |
125 | for (int i = 0, j = 0; i < argc; i++) { | 125 | int j; |
126 | for (i = 0, j = 0; i < argc; i++) { | ||
126 | if (!found_separator && i > 0) { | 127 | if (!found_separator && i > 0) { |
127 | if (strncmp(argv[i], "--output=", 9) == 0) { | 128 | if (strncmp(argv[i], "--output=", 9) == 0) { |
128 | continue; | 129 | continue; |