| makemap.c (223067) | makemap.c (249729) |
|---|---|
| 1/* 2 * Copyright (c) 1998-2002, 2004, 2008 Sendmail, Inc. and its suppliers. 3 * All rights reserved. 4 * Copyright (c) 1992 Eric P. Allman. All rights reserved. 5 * Copyright (c) 1992, 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * By using this file, you agree to the terms and conditions set --- 6 unchanged lines hidden (view full) --- 15 16SM_IDSTR(copyright, 17"@(#) Copyright (c) 1998-2002, 2004 Sendmail, Inc. and its suppliers.\n\ 18 All rights reserved.\n\ 19 Copyright (c) 1992 Eric P. Allman. All rights reserved.\n\ 20 Copyright (c) 1992, 1993\n\ 21 The Regents of the University of California. All rights reserved.\n") 22 | 1/* 2 * Copyright (c) 1998-2002, 2004, 2008 Sendmail, Inc. and its suppliers. 3 * All rights reserved. 4 * Copyright (c) 1992 Eric P. Allman. All rights reserved. 5 * Copyright (c) 1992, 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * By using this file, you agree to the terms and conditions set --- 6 unchanged lines hidden (view full) --- 15 16SM_IDSTR(copyright, 17"@(#) Copyright (c) 1998-2002, 2004 Sendmail, Inc. and its suppliers.\n\ 18 All rights reserved.\n\ 19 Copyright (c) 1992 Eric P. Allman. All rights reserved.\n\ 20 Copyright (c) 1992, 1993\n\ 21 The Regents of the University of California. All rights reserved.\n") 22 |
| 23SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.180 2010/11/23 02:35:08 gshapiro Exp $") | 23SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.181 2013/03/12 15:24:51 ca Exp $") |
| 24 25 26#include <sys/types.h> 27#ifndef ISC_UNIX 28# include <sys/file.h> 29#endif /* ! ISC_UNIX */ 30#include <ctype.h> 31#include <stdlib.h> --- 205 unchanged lines hidden (view full) --- 237 /* Find TrustedUser value in sendmail.cf */ 238 if ((cfp = sm_io_open(SmFtStdio, SM_TIME_DEFAULT, cfile, SM_IO_RDONLY, 239 NULL)) == NULL) 240 { 241 sm_io_fprintf(smioerr, SM_TIME_DEFAULT, "makemap: %s: %s\n", 242 cfile, sm_errstring(errno)); 243 exit(EX_NOINPUT); 244 } | 24 25 26#include <sys/types.h> 27#ifndef ISC_UNIX 28# include <sys/file.h> 29#endif /* ! ISC_UNIX */ 30#include <ctype.h> 31#include <stdlib.h> --- 205 unchanged lines hidden (view full) --- 237 /* Find TrustedUser value in sendmail.cf */ 238 if ((cfp = sm_io_open(SmFtStdio, SM_TIME_DEFAULT, cfile, SM_IO_RDONLY, 239 NULL)) == NULL) 240 { 241 sm_io_fprintf(smioerr, SM_TIME_DEFAULT, "makemap: %s: %s\n", 242 cfile, sm_errstring(errno)); 243 exit(EX_NOINPUT); 244 } |
| 245 while (sm_io_fgets(cfp, SM_TIME_DEFAULT, buf, sizeof(buf)) != NULL) | 245 while (sm_io_fgets(cfp, SM_TIME_DEFAULT, buf, sizeof(buf)) >= 0) |
| 246 { 247 register char *b; 248 249 if ((b = strchr(buf, '\n')) != NULL) 250 *b = '\0'; 251 252 b = buf; 253 switch (*b++) --- 133 unchanged lines hidden (view full) --- 387 388 } 389 (void) cursor->smdbc_close(cursor); 390 } 391 else 392 { 393 lineno = 0; 394 while (sm_io_fgets(smioin, SM_TIME_DEFAULT, ibuf, sizeof ibuf) | 246 { 247 register char *b; 248 249 if ((b = strchr(buf, '\n')) != NULL) 250 *b = '\0'; 251 252 b = buf; 253 switch (*b++) --- 133 unchanged lines hidden (view full) --- 387 388 } 389 (void) cursor->smdbc_close(cursor); 390 } 391 else 392 { 393 lineno = 0; 394 while (sm_io_fgets(smioin, SM_TIME_DEFAULT, ibuf, sizeof ibuf) |
| 395 != NULL) | 395 >= 0) |
| 396 { 397 register char *p; 398 399 lineno++; 400 401 /* 402 ** Parse the line. 403 */ --- 126 unchanged lines hidden --- | 396 { 397 register char *p; 398 399 lineno++; 400 401 /* 402 ** Parse the line. 403 */ --- 126 unchanged lines hidden --- |