tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2011/10/19 00:06:10 

[moduli.c]
     s/tmpfile/tmp/ to make this -Wshadow clean
This commit is contained in:
Darren Tucker 2011-11-04 10:52:43 +11:00
parent e68cf84ac8
commit 9ee09cfce6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -6,6 +6,9 @@
- djm@cvs.openbsd.org 2011/10/18 23:37:42 - djm@cvs.openbsd.org 2011/10/18 23:37:42
[ssh-add.c] [ssh-add.c]
add -k to usage(); reminded by jmc@ add -k to usage(); reminded by jmc@
- djm@cvs.openbsd.org 2011/10/19 00:06:10
[moduli.c]
s/tmpfile/tmp/ to make this -Wshadow clean
20111025 20111025
- (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file - (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file

12
moduli.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: moduli.c,v 1.24 2011/10/16 15:51:39 stsp Exp $ */ /* $OpenBSD: moduli.c,v 1.25 2011/10/19 00:06:10 djm Exp $ */
/* /*
* Copyright 1994 Phil Karn <karn@qualcomm.com> * Copyright 1994 Phil Karn <karn@qualcomm.com>
* Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@ -445,16 +445,16 @@ static void
write_checkpoint(char *cpfile, u_int32_t lineno) write_checkpoint(char *cpfile, u_int32_t lineno)
{ {
FILE *fp; FILE *fp;
char tmpfile[MAXPATHLEN]; char tmp[MAXPATHLEN];
int r; int r;
r = snprintf(tmpfile, sizeof(tmpfile), "%s.XXXXXXXXXX", cpfile); r = snprintf(tmp, sizeof(tmp), "%s.XXXXXXXXXX", cpfile);
if (r == -1 || r >= MAXPATHLEN) { if (r == -1 || r >= MAXPATHLEN) {
logit("write_checkpoint: temp pathname too long"); logit("write_checkpoint: temp pathname too long");
return; return;
} }
if ((r = mkstemp(tmpfile)) == -1) { if ((r = mkstemp(tmp)) == -1) {
logit("mkstemp(%s): %s", tmpfile, strerror(errno)); logit("mkstemp(%s): %s", tmp, strerror(errno));
return; return;
} }
if ((fp = fdopen(r, "w")) == NULL) { if ((fp = fdopen(r, "w")) == NULL) {
@ -463,7 +463,7 @@ write_checkpoint(char *cpfile, u_int32_t lineno)
return; return;
} }
if (fprintf(fp, "%lu\n", (unsigned long)lineno) > 0 && fclose(fp) == 0 if (fprintf(fp, "%lu\n", (unsigned long)lineno) > 0 && fclose(fp) == 0
&& rename(tmpfile, cpfile) == 0) && rename(tmp, cpfile) == 0)
debug3("wrote checkpoint line %lu to '%s'", debug3("wrote checkpoint line %lu to '%s'",
(unsigned long)lineno, cpfile); (unsigned long)lineno, cpfile);
else else