Print this page
make: unifdef for REDIRECT_ERR (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/dist.cc
          +++ new/usr/src/cmd/make/bin/dist.cc
↓ open down ↓ 284 lines elided ↑ open up ↑
 285  285          char            *current_path;
 286  286          static char     *env;
 287  287          int             length;
 288  288          char            netpath[MAXPATHLEN];
 289  289          mode_t          um;
 290  290          char            um_buf[MAXPATHLEN];
 291  291          Name            dmake_name;
 292  292          Name            dmake_value;
 293  293          Property        prop;
 294  294  
 295      -#ifdef REDIRECT_ERR
 296  295          /* Set __DMAKE_REDIRECT_STDERR */
 297  296          length = 2 + strlen(NOCATGETS("__DMAKE_REDIRECT_STDERR")) + 1;
 298  297          env = getmem(length);
 299  298          (void) sprintf(env,
 300  299                         "%s=%s",
 301  300                         NOCATGETS("__DMAKE_REDIRECT_STDERR"),
 302  301                         out_err_same ? NOCATGETS("0") : NOCATGETS("1"));
 303  302          (void) putenv(env);
 304      -#endif
 305  303  
 306  304          /* Set DMAKE_PWD to the current working directory */
 307  305          current_path = get_current_path();
 308  306          length = 2 + strlen(NOCATGETS("DMAKE_PWD")) + strlen(current_path);
 309  307          env = getmem(length);
 310  308          (void) sprintf(env,
 311  309                         "%s=%s",
 312  310                         NOCATGETS("DMAKE_PWD"),
 313  311                         current_path);
 314  312          (void) putenv(env);
↓ open down ↓ 253 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX