=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/job.c,v retrieving revision 1.88 retrieving revision 1.89 diff -c -r1.88 -r1.89 *** src/usr.bin/make/job.c 2007/09/23 14:58:50 1.88 --- src/usr.bin/make/job.c 2007/09/29 09:02:05 1.89 *************** *** 1,5 **** /* $OpenPackages$ */ ! /* $OpenBSD: job.c,v 1.88 2007/09/23 14:58:50 espie Exp $ */ /* $NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $ */ /* --- 1,5 ---- /* $OpenPackages$ */ ! /* $OpenBSD: job.c,v 1.89 2007/09/29 09:02:05 espie Exp $ */ /* $NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $ */ /* *************** *** 1423,1440 **** /*- *----------------------------------------------------------------------- * JobDoOutput -- ! * This function is called at different times depending on ! * whether the user has specified that output is to be collected ! * via pipes or temporary files. In the former case, we are called ! * whenever there is something to read on the pipe. We collect more ! * output from the given job and store it in the job's outBuf. If ! * this makes up a line, we print it tagged by the job's identifier, ! * as necessary. ! * If output has been collected in a temporary file, we open the ! * file and read it line by line, transfering it to our own ! * output channel until the file is empty. At which point we ! * remove the temporary file. ! * In both cases, however, we keep our figurative eye out for the * 'noPrint' line for the shell from which the output came. If * we recognize a line, we don't print it. If the command is not * alone on the line (the character after it is not \0 or \n), we --- 1423,1433 ---- /*- *----------------------------------------------------------------------- * JobDoOutput -- ! * This functions is called whenever there is something to read on the ! * pipe. We collect more output from the given job and store it in the ! * job's outBuf. If this makes up a line, we print it tagged by the job's ! * identifier, as necessary. ! * We also keep our figurative eye out for the * 'noPrint' line for the shell from which the output came. If * we recognize a line, we don't print it. If the command is not * alone on the line (the character after it is not \0 or \n), we *************** *** 1500,1506 **** break; } else if (job->outBuf[i] == '\0') { /* ! * Why? */ job->outBuf[i] = ' '; } --- 1493,1499 ---- break; } else if (job->outBuf[i] == '\0') { /* ! * To be fixed: don't use printf, it stops at NUL bytes. */ job->outBuf[i] = ' '; }