"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "sunpro/Make/bin/make/common/read2.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.

read2.cc  (schily-2021-08-14.tar.bz2)	:	read2.cc  (schily-2021-09-18.tar.bz2)
skipping to change at line 36		skipping to change at line 36
*/		*/
/*		/*
* @(#)read2.cc 1.53 06/12/12		* @(#)read2.cc 1.53 06/12/12
*/		*/
#pragma ident "@(#)read2.cc 1.53 06/12/12"		#pragma ident "@(#)read2.cc 1.53 06/12/12"
/*		/*
* Copyright 2017-2021 J. Schilling		* Copyright 2017-2021 J. Schilling
*		*
* @(#)read2.cc 1.24 21/08/13 2017-2021 J. Schilling		* @(#)read2.cc 1.26 21/09/06 2017-2021 J. Schilling
*/		*/
#include <schily/mconfig.h>		#include <schily/mconfig.h>
#ifndef lint		#ifndef lint
static UConst char sccsid[] =		static UConst char sccsid[] =
"@(#)read2.cc 1.24 21/08/13 2017-2021 J. Schilling";		"@(#)read2.cc 1.26 21/09/06 2017-2021 J. Schilling";
#endif		#endif
/*		/*
* read.c		* read.c
*		*
* This file contains the makefile reader.		* This file contains the makefile reader.
*/		*/
/*		/*
* Included files		* Included files
skipping to change at line 1159		skipping to change at line 1159
* svr4 Set when ".SVR4" target is read		* svr4 Set when ".SVR4" target is read
* svr4_name The Name ".SVR4"		* svr4_name The Name ".SVR4"
* posix Set when ".POSIX" target is read		* posix Set when ".POSIX" target is read
* posix_name The Name ".POSIX"		* posix_name The Name ".POSIX"
* current_make_version The Name "<current version number>"		* current_make_version The Name "<current version number>"
* default_rule Set when ".DEFAULT" target is read		* default_rule Set when ".DEFAULT" target is read
* default_rule_name The Name ".DEFAULT", used for tracing		* default_rule_name The Name ".DEFAULT", used for tracing
* dot_keep_state The Name ".KEEP_STATE", used for tracing		* dot_keep_state The Name ".KEEP_STATE", used for tracing
* ignore_errors Set if ".IGNORE" target is read		* ignore_errors Set if ".IGNORE" target is read
* ignore_name The Name ".IGNORE", used for tracing		* ignore_name The Name ".IGNORE", used for tracing
		* include_failed_name The Name ".INCLUDE_FAILED", used for automake
* keep_state Set if ".KEEP_STATE" target is read		* keep_state Set if ".KEEP_STATE" target is read
* no_parallel_name The Name ".NO_PARALLEL", used for tracing		* no_parallel_name The Name ".NO_PARALLEL", used for tracing
* notparallel_name The Name ".NOTPARALLEL", used for tracing		* notparallel_name The Name ".NOTPARALLEL", used for tracing
* notparallel Set if ".NOTPARALLEL" target is read		* notparallel Set if ".NOTPARALLEL" target is read
* only_parallel Set to indicate only some targets runs parallel		* only_parallel Set to indicate only some targets runs parallel
* parallel_name The Name ".PARALLEL", used for tracing		* parallel_name The Name ".PARALLEL", used for tracing
* phony The Name ".PHONY", used for tracing		* phony The Name ".PHONY", used for tracing
* precious The Name ".PRECIOUS", used for tracing		* precious The Name ".PRECIOUS", used for tracing
* sccs_get_name The Name ".SCCS_GET", used for tracing		* sccs_get_name The Name ".SCCS_GET", used for tracing
* sccs_get_posix_name The Name ".SCCS_GET_POSIX", used for tracing		* sccs_get_posix_name The Name ".SCCS_GET_POSIX", used for tracing
* get_name The Name ".GET", used for tracing		* get_name The Name ".GET", used for tracing
* sccs_get_rule Set when ".SCCS_GET" target is read		* sccs_get_rule Set when ".SCCS_GET" target is read
* silent Set when ".SILENT" target is read		* silent Set when ".SILENT" target is read
* silent_name The Name ".SILENT", used for tracing		* silent_name The Name ".SILENT", used for tracing
* trace_reader Indicates that we should echo stuff we read		* trace_reader Indicates that we should echo stuff we read
*/		*/
void		void
special_reader(Name target, register Name_vector depes, Cmd_line command)		special_reader(Name target, register Name_vector depes, Cmd_line command, Separa tor separator)
{		{
register int n;		register int n;
switch (target->special_reader) {		switch (target->special_reader) {
case svr4_special:		case svr4_special:
if (depes->used != 0) {		if (depes->used != 0) {
fatal_reader(gettext("Illegal dependencies for target `%s '"),		fatal_reader(gettext("Illegal dependencies for target `%s '"),
target->string_mb);		target->string_mb);
}		}
skipping to change at line 1229		skipping to change at line 1230
/* turn keep state off being SunPro make specific */		/* turn keep state off being SunPro make specific */
keep_state = false;		keep_state = false;
#if defined(SUN5_0)		#if defined(SUN5_0)
/* Use /usr/xpg4/bin/sh on Solaris */		/* Use /usr/xpg4/bin/sh on Solaris */
#ifdef HAVE__USR_XPG4_BIN_SH		#ifdef HAVE__USR_XPG4_BIN_SH
MBSTOWCS(wcs_buffer, NOCATGETS("/usr/xpg4/bin/sh"));		MBSTOWCS(wcs_buffer, NOCATGETS("/usr/xpg4/bin/sh"));
#else		#else
#ifdef HAVE__OPT_SCHILY_XPG4_BIN_SH		#ifdef HAVE__OPT_SCHILY_XPG4_BIN_SH
MBSTOWCS(wcs_buffer, NOCATGETS("/opt/schily/xpg4/bin/sh"));		MBSTOWCS(wcs_buffer, NOCATGETS("/opt/schily/xpg4/bin/sh"));
#else		#else
		#ifdef HAVE__BIN_POSIX_SH
		MBSTOWCS(wcs_buffer, NOCATGETS("/bin/posix/sh"));
		#else
MBSTOWCS(wcs_buffer, NOCATGETS("/bin/sh"));		MBSTOWCS(wcs_buffer, NOCATGETS("/bin/sh"));
#endif		#endif
#endif		#endif
		#endif
(void) SETVAR(shell_name, GETNAME(wcs_buffer, FIND_LENGTH), false );		(void) SETVAR(shell_name, GETNAME(wcs_buffer, FIND_LENGTH), false );
#endif		#endif
if (trace_reader) {		if (trace_reader) {
(void) printf("%s:\n", posix_name->string_mb);		(void) printf("%s:\n", posix_name->string_mb);
}		}
break;		break;
case built_last_make_run_special:		case built_last_make_run_special:
built_last_make_run_seen = true;		built_last_make_run_seen = true;
break;		break;
skipping to change at line 1292		skipping to change at line 1297
for (; depes != NULL; depes = depes->next) {		for (; depes != NULL; depes = depes->next) {
for (n = 0; n < depes->used; n++) {		for (n = 0; n < depes->used; n++) {
depes->names[n]->ignore_error_mode = true;		depes->names[n]->ignore_error_mode = true;
}		}
}		}
if (trace_reader) {		if (trace_reader) {
(void) printf("%s:\n", ignore_name->string_mb);		(void) printf("%s:\n", ignore_name->string_mb);
}		}
break;		break;
		#ifdef DO_INCLUDE_FAILED
		case include_failed_special:
		if (svr4 || sunpro_compat)
		break;
		if (depes->used != 0) {
		fatal_reader(gettext("Illegal dependencies for target `%s
		'"),
		target->string_mb);
		}
		if (command) {
		include_failed = true;
		enter_dependencies(target,
		NULL,
		depes,
		command,
		separator);
		}
		break;
		#endif
case keep_state_special:		case keep_state_special:
if(svr4)		if(svr4)
break;		break;
/* ignore keep state, being SunPro make specific */		/* ignore keep state, being SunPro make specific */
if(posix)		if(posix)
break;		break;
if (depes->used != 0) {		if (depes->used != 0) {
fatal_reader(gettext("Illegal dependencies for target `%s '"),		fatal_reader(gettext("Illegal dependencies for target `%s '"),
target->string_mb);		target->string_mb);
}		}
End of changes. 7 change blocks.
3 lines changed or deleted		28 lines changed or added

---