projects
/
tfcrypt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tfstream: add separate xor_block function
[tfcrypt.git]
/
tfc_base64.c
diff --git
a/tfc_base64.c
b/tfc_base64.c
index c76fdd90dfe912e809dd8d5d2cc257fb72f198fd..b2edcbc7e705cb4ed7a3f8d854cef937c01edc19 100644
(file)
--- 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;
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 = 0; dfd = 1;
if (fargv[0]) {
if (!strcmp(fargv[0], "-")) sfd = 0;
else {
- sfd = open(fargv[0], O_RDONLY | O_LARGEFILE);
+ sfd =
x
open(fargv[0], O_RDONLY | O_LARGEFILE);
if (do_preserve_time) if (fstat(sfd, &s_stat) == -1)
xerror(YES, NO, YES, "stat(%s)", fargv[0]);
}
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;
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) {
}
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));
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);
}
xexit(0);
}