projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bounds on workspace for Karatsuba operations.
[u/mdw/catacomb]
/
key-file.c
diff --git
a/key-file.c
b/key-file.c
index
ab620e7
..
2e556e9
100644
(file)
--- a/
key-file.c
+++ b/
key-file.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: key-file.c,v 1.
1 1999/12/22 15:47:4
8 mdw Exp $
+ * $Id: key-file.c,v 1.
2 2001/02/03 11:57:3
8 mdw Exp $
*
* System-dependent key filing operations
*
*
* System-dependent key filing operations
*
@@
-30,6
+30,9
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: key-file.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: key-file.c,v $
+ * Revision 1.2 2001/02/03 11:57:38 mdw
+ * Allow creating keyfiles with no file attached.
+ *
* Revision 1.1 1999/12/22 15:47:48 mdw
* Major key-management revision.
*
* Revision 1.1 1999/12/22 15:47:48 mdw
* Major key-management revision.
*
@@
-108,6
+111,8
@@
int key_save(key_file *f)
if (!(f->f & KF_MODIFIED))
return (KWRITE_OK);
if (!(f->f & KF_MODIFIED))
return (KWRITE_OK);
+ if (!f->fp)
+ return (KWRITE_FAIL);
/* --- Write a new key file out --- *
*
/* --- Write a new key file out --- *
*
@@
-271,7
+276,7
@@
fail_write:
*
* Arguments: @key_file *f@ = pointer to file structure to initialize
* @const char *file@ = pointer to the file name
*
* Arguments: @key_file *f@ = pointer to file structure to initialize
* @const char *file@ = pointer to the file name
- * @
int
how@ = opening options (@KOPEN_*@).
+ * @
unsigned
how@ = opening options (@KOPEN_*@).
*
* Returns: Zero if it worked, nonzero otherwise.
*
*
* Returns: Zero if it worked, nonzero otherwise.
*
@@
-286,15
+291,22
@@
fail_write:
* for the private use of @key_open@.
*/
* for the private use of @key_open@.
*/
-int key_lockfile(key_file *f, const char *file,
int
how)
+int key_lockfile(key_file *f, const char *file,
unsigned
how)
{
int of, lf;
const char *ff;
int fd;
{
int of, lf;
const char *ff;
int fd;
+ /* --- Handle the magic no-file option --- */
+
+ if (how & KOPEN_NOFILE) {
+ f->fp = 0;
+ return (0);
+ }
+
/* --- Lots of things depend on whether we're writing --- */
/* --- Lots of things depend on whether we're writing --- */
- switch (how) {
+ switch (how
& KOPEN_MASK
) {
case KOPEN_READ:
of = O_RDONLY;
lf = LOCK_NONEXCL;
case KOPEN_READ:
of = O_RDONLY;
lf = LOCK_NONEXCL;