/* -*-c-*-
*
- * $Id: key-file.c,v 1.2 2001/02/03 11:57:38 mdw Exp $
+ * $Id$
*
* System-dependent key filing operations
*
* (c) 1999 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of Catacomb.
*
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
- *
+ *
* Catacomb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Library General Public
* License along with Catacomb; if not, write to the Free
* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
-/*----- 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.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include <errno.h>
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 ||
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);
}
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 --- *
dstr_destroy(&n_old);
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_open:
+fail_open:
dstr_destroy(&n_new);
return (rc);
}