X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_base64.c;h=b2edcbc7e705cb4ed7a3f8d854cef937c01edc19;hb=e3b1cafef772fa27575cedeb98a9e241ac6ecc8f;hp=c76fdd90dfe912e809dd8d5d2cc257fb72f198fd;hpb=a874fa08a172c1d5006d15d05e494e1b9fbda211;p=tfcrypt.git diff --git a/tfc_base64.c b/tfc_base64.c index c76fdd9..b2edcbc 100644 --- a/tfc_base64.c +++ b/tfc_base64.c @@ -36,12 +36,14 @@ void do_edbase64(char **fargv) struct base64_encodestate estate; size_t lread = 0; + xexit_no_nl = YES; + sfd = 0; dfd = 1; if (fargv[0]) { if (!strcmp(fargv[0], "-")) sfd = 0; else { - sfd = open(fargv[0], O_RDONLY | O_LARGEFILE); + sfd = xopen(fargv[0], O_RDONLY | O_LARGEFILE); if (do_preserve_time) if (fstat(sfd, &s_stat) == -1) xerror(YES, NO, YES, "stat(%s)", fargv[0]); } @@ -50,8 +52,7 @@ void do_edbase64(char **fargv) if (fargv[0] && fargv[1]) { if (!strcmp(fargv[1], "-")) dfd = 1; - else dfd = open(fargv[1], O_WRONLY | O_CREAT | O_LARGEFILE | write_flags, 0666); - if (dfd == -1) xerror(NO, NO, YES, "%s", fargv[1]); + else dfd = xopen(fargv[1], O_WRONLY | O_CREAT | O_LARGEFILE | write_flags); } if (do_edcrypt == TFC_DO_ENCRYPT) { @@ -148,7 +149,6 @@ _wagain: lio = xwrite(dfd, pblk, lrem); memset(&estate, 0, sizeof(struct base64_encodestate)); memset(&dstate, 0, sizeof(struct base64_decodestate)); - if (do_preserve_time) fcopy_matime(dfd, &s_stat); xexit(0); }