"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "sunpro/Make/bin/make/common/main.cc" between
schily-2021-08-14.tar.bz2 and schily-2021-09-18.tar.bz2

About: Schily Tools are a collection of programs like cdrecord, cdda2wav, mkisofs, star and much more. In memoriam of the author Jörg Schilling, who passed away in October 2021.

main.cc  (schily-2021-08-14.tar.bz2)	:	main.cc  (schily-2021-09-18.tar.bz2)
skipping to change at line 36		skipping to change at line 36
*/		*/
/*		/*
* @(#)main.cc 1.158 06/12/12		* @(#)main.cc 1.158 06/12/12
*/		*/
#pragma ident "@(#)main.cc 1.158 06/12/12"		#pragma ident "@(#)main.cc 1.158 06/12/12"
/*		/*
* Copyright 2017-2021 J. Schilling		* Copyright 2017-2021 J. Schilling
*		*
* @(#)main.cc 1.58 21/08/13 2017-2021 J. Schilling		* @(#)main.cc 1.60 21/08/30 2017-2021 J. Schilling
*/		*/
#include <schily/mconfig.h>		#include <schily/mconfig.h>
#ifndef lint		#ifndef lint
static UConst char sccsid[] =		static UConst char sccsid[] =
"@(#)main.cc 1.58 21/08/13 2017-2021 J. Schilling";		"@(#)main.cc 1.60 21/08/30 2017-2021 J. Schilling";
#endif		#endif
/*		/*
* main.cc		* main.cc
*		*
* make program main routine plus some helper routines		* make program main routine plus some helper routines
*/		*/
/*		/*
* Included files		* Included files
skipping to change at line 962		skipping to change at line 962
gnu_style = true;		gnu_style = true;
svr4 = false;		svr4 = false;
posix = false;		posix = false;
} else if (0 == strcasecmp(dmake_compat_mode_var,		} else if (0 == strcasecmp(dmake_compat_mode_var,
NOCATGETS("POSIX"))) {		NOCATGETS("POSIX"))) {
sunpro_compat = false;		sunpro_compat = false;
gnu_style = false;		gnu_style = false;
svr4 = false;		svr4 = false;
posix = true;		posix = true;
} else if (0 == strcasecmp(dmake_compat_mode_var,		} else if (0 == strcasecmp(dmake_compat_mode_var,
		NOCATGETS("SUN"))) {
		sunpro_compat = true;
		gnu_style = false;
		svr4 = false;
		posix = false;
		} else if (0 == strcasecmp(dmake_compat_mode_var,
NOCATGETS("SVR4"))) {		NOCATGETS("SVR4"))) {
sunpro_compat = false;		sunpro_compat = false;
gnu_style = false;		gnu_style = false;
svr4 = true;		svr4 = true;
posix = false;		posix = false;
}		}
//svr4 = false;		//svr4 = false;
//posix = false;		//posix = false;
}		}
}		}
skipping to change at line 1561		skipping to change at line 1567
}		}
tptr = strchr(SUNPRO_CMD_OPTS, optopt);		tptr = strchr(SUNPRO_CMD_OPTS, optopt);
}		}
if (!tptr) {		if (!tptr) {
fatal(gettext("Unknown option `-%c'"), optopt);		fatal(gettext("Unknown option `-%c'"), optopt);
} else {		} else {
fatal(gettext("Missing argument after `-%c'"), op topt);		fatal(gettext("Missing argument after `-%c'"), op topt);
}		}
}		}
#if defined(linux)
if (ch == 1) {
if(optind < argc) {
//optind++;
//current_optind++;
makefile_next = 0;
current_optind = optind;
continue;
} else {
break;
}
}
#endif
makefile_next |= parse_command_option(ch);		makefile_next |= parse_command_option(ch);
/*		/*
* If we're done processing all of the options of		* If we're done processing all of the options of
* ONE argument string...		* ONE argument string...
*/		*/
if (current_optind < optind) {		if (current_optind < optind) {
i = current_optind;		i = current_optind;
k = 0;		k = 0;
/* If there's an argument for an option... */		/* If there's an argument for an option... */
if ((optind - current_optind) > 1) {		if ((optind - current_optind) > 1) {
End of changes. 4 change blocks.
16 lines changed or deleted		8 lines changed or added

---