projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix catsign verify for -C.
[u/mdw/catacomb]
/
key-file.c
diff --git
a/key-file.c
b/key-file.c
index
15b0304
..
dc9efc0
100644
(file)
--- a/
key-file.c
+++ b/
key-file.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id
: key-file.c,v 1.3 2004/04/08 01:36:15 mdw Exp
$
+ * $Id$
*
* System-dependent key filing operations
*
*
* System-dependent key filing operations
*
@@
-60,6
+60,7
@@
static int fdcopy(int source, int dest)
{
char buf[4096];
static int fdcopy(int source, int dest)
{
char buf[4096];
+ char *p;
if (lseek(source, 0, SEEK_SET) < 0||
lseek(dest, 0, SEEK_SET) < 0 ||
if (lseek(source, 0, SEEK_SET) < 0||
lseek(dest, 0, SEEK_SET) < 0 ||
@@
-71,8
+72,14
@@
static int fdcopy(int source, int dest)
return (-1);
else if (n == 0)
break;
return (-1);
else if (n == 0)
break;
- else if (write(dest, buf, n) < 0)
- return (-1);
+ p = buf;
+ while (n) {
+ int nn = write(dest, p, n);
+ if (nn < 0)
+ return (-1);
+ p += nn;
+ n -= nn;
+ }
}
return (0);
}
}
return (0);
}
@@
-190,6
+197,9
@@
int key_save(key_file *f)
unlink(n_new.buf);
unlink(n_older.buf);
unlink(n_new.buf);
unlink(n_older.buf);
+ dstr_destroy(&n_new);
+ dstr_destroy(&n_old);
+ dstr_destroy(&n_older);
return (KWRITE_OK);
/* --- Failure while writing the new key file --- *
return (KWRITE_OK);
/* --- Failure while writing the new key file --- *
@@
-248,15
+258,15
@@
fail_shift:
dstr_destroy(&n_older);
return (rc);
dstr_destroy(&n_older);
return (rc);
-/* --- Failure during write of new data --- *
- *
- * Clean up the new file and return. These errors can never cause
- * breakage.
- */
+
/* --- Failure during write of new data --- *
+
*
+
* Clean up the new file and return. These errors can never cause
+
* breakage.
+
*/
fail_write:
unlink(n_new.buf);
fail_write:
unlink(n_new.buf);
-
fail_open:
+fail_open:
dstr_destroy(&n_new);
return (rc);
}
dstr_destroy(&n_new);
return (rc);
}