the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Output the command line for sub-processes when -d is given

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@1348 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2002-07-11 19:46:11 +00:00
parent 4fd0da1635
commit 30f4bc52f7
3 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cl65/global.c
View File

@@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1999 Ullrich von Bassewitz */ /* (C) 1998-2002 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Wacholderweg 14 */
/* D-70597 Stuttgart */ /* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */ /* EMail: uz@musoftware.de */
@@ -43,3 +43,7 @@
unsigned char Debug = 0; /* Debug mode enabled? */

6
src/cl65/global.h
View File

@@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998 Ullrich von Bassewitz */ /* (C) 1998-2002 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Wacholderweg 14 */
/* D-70597 Stuttgart */ /* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */ /* EMail: uz@musoftware.de */
@@ -44,6 +44,10 @@
extern unsigned char Debug; /* Debug mode enabled? */
/* End of global.h */ /* End of global.h */
#endif #endif

31
src/cl65/main.c
View File

@@ -282,6 +282,17 @@ static void CmdSetTarget (CmdDesc* Cmd, target_t Target)
static void CmdPrint (CmdDesc* Cmd, FILE* F)
/* Output the command line encoded in the command desc */
{
unsigned I;
for (I = 0; I < Cmd->ArgCount && Cmd->Args[I] != 0; ++I) {
fprintf (F, "%s ", Cmd->Args[I]);
}
}
/*****************************************************************************/ /*****************************************************************************/
/* Target handling */ /* Target handling */
/*****************************************************************************/ /*****************************************************************************/
@@ -322,8 +333,17 @@ static void SetTargetFiles (void)
static void ExecProgram (CmdDesc* Cmd) static void ExecProgram (CmdDesc* Cmd)
/* Execute a subprocess with the given name/parameters. Exit on errors. */ /* Execute a subprocess with the given name/parameters. Exit on errors. */
{ {
int Status;
/* If in debug mode, output the command line we will execute */
if (Debug) {
printf ("Executing: ");
CmdPrint (Cmd, stdout);
printf ("\n");
}
/* Call the program */ /* Call the program */
int Status = spawnvp (P_WAIT, Cmd->Name, Cmd->Args); Status = spawnvp (P_WAIT, Cmd->Name, Cmd->Args);
/* Check the result code */ /* Check the result code */
if (Status < 0) { if (Status < 0) {
@@ -366,15 +386,13 @@ static void Link (void)
*/ */
if (OutputName) { if (OutputName) {
CmdAddArg (&LD65, "-o"); CmdSetOutput (&LD65, OutputName);
CmdAddArg (&LD65, OutputName);
} else if (FirstInput && FindExt (FirstInput)) { /* Only if ext present! */ } else if (FirstInput && FindExt (FirstInput)) { /* Only if ext present! */
const char* Extension = Module? MODULE_EXT : ""; const char* Extension = Module? MODULE_EXT : "";
char* Output = MakeFilename (FirstInput, Extension); char* Output = MakeFilename (FirstInput, Extension);
CmdAddArg (&LD65, "-o"); CmdSetOutput (&LD65, Output);
CmdAddArg (&LD65, Output);
xfree (Output); xfree (Output);
} }
@@ -700,9 +718,10 @@ static void OptDataName (const char* Opt attribute ((unused)), const char* Arg)
static void OptDebug (const char* Opt attribute ((unused)), static void OptDebug (const char* Opt attribute ((unused)),
const char* Arg attribute ((unused))) const char* Arg attribute ((unused)))
/* Debug mode (compiler) */ /* Debug mode (compiler and cl65 utility) */
{ {
CmdAddArg (&CC65, "-d"); CmdAddArg (&CC65, "-d");
Debug = 1;
} }