projects
/
tfcrypt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix quiet mode and final reporting when using -O count.
[tfcrypt.git]
/
tfc_base64.c
diff --git
a/tfc_base64.c
b/tfc_base64.c
index d2b3333ca9b5ab833a3b61824e799eb198cee296..c76fdd90dfe912e809dd8d5d2cc257fb72f198fd 100644
(file)
--- a/
tfc_base64.c
+++ b/
tfc_base64.c
@@
-28,6
+28,8
@@
#include "tfcrypt.h"
#include "tfcrypt.h"
+enum { TFB64_STOP1 = 1, TFB64_STOPF };
+
void do_edbase64(char **fargv)
{
struct base64_decodestate dstate;
void do_edbase64(char **fargv)
{
struct base64_decodestate dstate;
@@
-70,7
+72,7
@@
void do_edbase64(char **fargv)
ldone = 0;
if (error_action == TFC_ERRACT_SYNC) rdpos = tfc_fdgetpos(sfd);
_again: lio = xread(sfd, pblk, lrem);
ldone = 0;
if (error_action == TFC_ERRACT_SYNC) rdpos = tfc_fdgetpos(sfd);
_again: lio = xread(sfd, pblk, lrem);
- if (lio == 0) do_stop =
YES
;
+ if (lio == 0) do_stop =
TFB64_STOP1
;
if (lio != NOSIZE) ldone += lio;
else {
if (errno != EIO && catch_all_errors != YES)
if (lio != NOSIZE) ldone += lio;
else {
if (errno != EIO && catch_all_errors != YES)
@@
-108,7
+110,7
@@
_again: lio = xread(sfd, pblk, lrem);
pblk = dstblk;
if (ldone == 0) {
pblk = dstblk;
if (ldone == 0) {
- do_stop = TF
C_STOP_FULL
;
+ do_stop = TF
B64_STOPF
;
break;
}
lrem = ldone;
break;
}
lrem = ldone;
@@
-118,7
+120,7
@@
_wagain: lio = xwrite(dfd, pblk, lrem);
else xerror(NO, NO, NO, "%s", fargv[1]);
if (do_edcrypt == TFC_DO_ENCRYPT) {
size_t t;
else xerror(NO, NO, NO, "%s", fargv[1]);
if (do_edcrypt == TFC_DO_ENCRYPT) {
size_t t;
- if (lread >= lblock || do_stop == TF
C_STOP_FULL
) {
+ if (lread >= lblock || do_stop == TF
B64_STOPF
) {
t = xwrite(dfd, "\n", 1);
if (t != NOSIZE) lio += t;
else lio = NOSIZE;
t = xwrite(dfd, "\n", 1);
if (t != NOSIZE) lio += t;
else lio = NOSIZE;
@@
-134,13
+136,13
@@
_wagain: lio = xwrite(dfd, pblk, lrem);
}
}
}
}
- if (do_edcrypt == TFC_DO_ENCRYPT && do_stop == TF
C_STOP_BEGAN
) {
+ if (do_edcrypt == TFC_DO_ENCRYPT && do_stop == TF
B64_STOP1
) {
size_t t = estate.count;
pblk = dstblk + estate.count;
base64_encode_blockend((char *)dstblk, &estate);
lrem = estate.count - t;
ldone = 0;
size_t t = estate.count;
pblk = dstblk + estate.count;
base64_encode_blockend((char *)dstblk, &estate);
lrem = estate.count - t;
ldone = 0;
- do_stop = TF
C_STOP_FULL
;
+ do_stop = TF
B64_STOPF
;
goto _wagain;
}
goto _wagain;
}