aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2020-08-08 09:37:30 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2020-08-08 09:37:30 -0400
commit566dd4c8e9edd62a660f025327f5380397659632 (patch)
tree7ab19eefe166bd45fbc4bfed5ed661a5e4497622
parenttypos (diff)
downloadfirejail-566dd4c8e9edd62a660f025327f5380397659632.tar.gz
firejail-566dd4c8e9edd62a660f025327f5380397659632.tar.zst
firejail-566dd4c8e9edd62a660f025327f5380397659632.zip
fix for older gcc compilerss
-rwxr-xr-xconfigure14
-rw-r--r--src/firejail/output.c3
2 files changed, 3 insertions, 14 deletions
diff --git a/configure b/configure
index e6d66a5a3..d2dd32ffc 100755
--- a/configure
+++ b/configure
@@ -682,7 +682,6 @@ infodir
682docdir 682docdir
683oldincludedir 683oldincludedir
684includedir 684includedir
685runstatedir
686localstatedir 685localstatedir
687sharedstatedir 686sharedstatedir
688sysconfdir 687sysconfdir
@@ -775,7 +774,6 @@ datadir='${datarootdir}'
775sysconfdir='${prefix}/etc' 774sysconfdir='${prefix}/etc'
776sharedstatedir='${prefix}/com' 775sharedstatedir='${prefix}/com'
777localstatedir='${prefix}/var' 776localstatedir='${prefix}/var'
778runstatedir='${localstatedir}/run'
779includedir='${prefix}/include' 777includedir='${prefix}/include'
780oldincludedir='/usr/include' 778oldincludedir='/usr/include'
781docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' 779docdir='${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
1174for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ 1163for 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
1178do 1167do
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;