FW: Problems with GNU make in Windows 7 (64-bit)

[Rob Juergens]

Adding the cc

-----Original Message-----
From: Eli Zaretskii [mailto:address@hidden 
Sent: Friday, May 06, 2011 1:19 PM
To: Rob Juergens
Subject: Re: Problems with GNU make in Windows 7 (64-bit)

> From: Rob Juergens <address@hidden>
> Date: Fri, 6 May 2011 13:00:29 -0700
> 
> I'm not familiar with the diff output below.  It is different from normal 
> diff output.

What is "normal output" from diff?  I show below 2 more formats,
perhaps one of them is what you expect.

The format I sent means: delete every line that is preceded with a
"-", and add lines that are preceded with a "+".

> Can you either send me the output as from diff or, even better, just send me 
> a new job.c file?

See below.

Format 1:

*** job.c~2     2010-07-24 14:27:50.000000000 +0300
--- job.c       2011-05-06 22:24:41.879500000 +0300
***************
*** 2792,2803 ****
  
      unsigned int shell_len = strlen (shell);
      unsigned int line_len = strlen (line);
!     unsigned int sflags_len = strlen (shellflags);
      char *command_ptr = NULL; /* used for batch_mode_shell mode */
      char *new_line;
  
  # ifdef __EMX__ /* is this necessary? */
!     if (!unixy_shell)
        shellflags[0] = '/'; /* "/c" */
  # endif
  
--- 2792,2803 ----
  
      unsigned int shell_len = strlen (shell);
      unsigned int line_len = strlen (line);
!     unsigned int sflags_len = shellflags ? strlen (shellflags) : 0;
      char *command_ptr = NULL; /* used for batch_mode_shell mode */
      char *new_line;
  
  # ifdef __EMX__ /* is this necessary? */
!     if (!unixy_shell && shellflags)
        shellflags[0] = '/'; /* "/c" */
  # endif
  
***************
*** 2859,2877 ****
  
        new_argv = xmalloc (4 * sizeof (char *));
        new_argv[0] = xstrdup(shell);
!       new_argv[1] = xstrdup(shellflags);
        new_argv[2] = line;
        new_argv[3] = NULL;
        return new_argv;
        }
  
!     new_line = alloca (shell_len + 1 + sflags_len + 1
                               + (line_len*2) + 1);
      ap = new_line;
!     memcpy (ap, shell, shell_len);
!     ap += shell_len;
      *(ap++) = ' ';
!     memcpy (ap, shellflags, sflags_len);
      ap += sflags_len;
      *(ap++) = ' ';
      command_ptr = ap;
--- 2859,2882 ----
  
        new_argv = xmalloc (4 * sizeof (char *));
        new_argv[0] = xstrdup(shell);
!       new_argv[1] = xstrdup(shellflags ? shellflags : "");
        new_argv[2] = line;
        new_argv[3] = NULL;
        return new_argv;
        }
  
!     new_line = alloca ((shell_len*2) + 1 + sflags_len + 1
                               + (line_len*2) + 1);
      ap = new_line;
!     for (p = shell; *p != '\0'; ++p)
!       {
!       if (strchr (sh_chars, *p) != 0)
!         *(ap++) = '\\';
!       *(ap++) = *p;
!       }
      *(ap++) = ' ';
!     if (shellflags)
!       memcpy (ap, shellflags, sflags_len);
      ap += sflags_len;
      *(ap++) = ' ';
      command_ptr = ap;


Format 2:

2795c2795
<     unsigned int sflags_len = strlen (shellflags);
---
>     unsigned int sflags_len = shellflags ? strlen (shellflags) : 0;
2800c2800
<     if (!unixy_shell)
---
>     if (!unixy_shell && shellflags)
2862c2862
<       new_argv[1] = xstrdup(shellflags);
---
>       new_argv[1] = xstrdup(shellflags ? shellflags : "");
2868c2868
<     new_line = alloca (shell_len + 1 + sflags_len + 1
---
>     new_line = alloca ((shell_len*2) + 1 + sflags_len + 1
2871,2872c2871,2876
<     memcpy (ap, shell, shell_len);
<     ap += shell_len;
---
>     for (p = shell; *p != '\0'; ++p)
>       {
>       if (strchr (sh_chars, *p) != 0)
>         *(ap++) = '\\';
>       *(ap++) = *p;
>       }
2874c2878,2879
<     memcpy (ap, shellflags, sflags_len);
---
>     if (shellflags)
>       memcpy (ap, shellflags, sflags_len);