1
0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-25 15:27:03 +01:00

Fixed some typos.

This commit is contained in:
Timo Schulz 2002-01-12 22:31:41 +00:00
parent 03c95c69a0
commit b3a5994235
2 changed files with 59 additions and 29 deletions

View File

@ -11,13 +11,14 @@
--delete-secret-key(s) and --delete-secret-and-public-key(s) as --delete-secret-key(s) and --delete-secret-and-public-key(s) as
well. well.
2001-01-09 Timo Schulz <ts@winpt.org> 2002-01-09 Timo Schulz <ts@winpt.org>
* encode.c (encode_crypt_files): Now it behaves like verify_files. * encode.c (encode_crypt_files): Now it behaves like verify_files.
* g10.c (main): We don't need to check argc for encode_crypt_files * g10.c (main): We don't need to check argc for encode_crypt_files
any longer. any longer.
2001-01-09 Timo Schulz <ts@winpt.org> 2002-01-09 Timo Schulz <ts@winpt.org>
* exec.c: Include windows.h for dosish systems. * exec.c: Include windows.h for dosish systems.

View File

@ -569,32 +569,61 @@ void
encode_crypt_files(int nfiles, char **files, STRLIST remusr) encode_crypt_files(int nfiles, char **files, STRLIST remusr)
{ {
int rc = 0; int rc = 0;
if (opt.outfile)
{
if (opt.verbose)
log_info(_("ignore --output for multiple files"));
opt.outfile = NULL;
}
if (!nfiles) { if (!nfiles)
char line[2048]; {
unsigned int lno = 0; char line[2048];
while ( fgets(line, DIM(line), stdin) ) { unsigned int lno = 0;
lno++; while ( fgets(line, DIM(line), stdin) )
if (!*line || line[strlen(line)-1] != '\n') { {
log_error("input line %u too long or missing LF\n", lno); lno++;
return; if (!*line || line[strlen(line)-1] != '\n')
} {
line[strlen(line)-1] = '\0'; log_error("input line %u too long or missing LF\n", lno);
print_file_status(STATUS_FILE_START, line, 2); return;
if ( (rc = encode_crypt(line, remusr)) ) }
log_error("%s: encryption failed: %s\n", print_fname_stdin(line), line[strlen(line)-1] = '\0';
g10_errstr(rc) ); print_file_status(STATUS_FILE_START, line, 2);
write_status( STATUS_FILE_DONE ); if ( (rc = encode_crypt(line, remusr)) )
} log_error("%s: encryption failed: %s\n",
} print_fname_stdin(line), g10_errstr(rc) );
else { write_status( STATUS_FILE_DONE );
while (nfiles--) { }
print_file_status(STATUS_FILE_START, *files, 2); }
if ( (rc = encode_crypt(*files, remusr)) ) else
log_error("%s: encryption failed: %s\n", print_fname_stdin(*files), {
g10_errstr(rc) ); while (nfiles--)
write_status( STATUS_FILE_DONE ); {
files++; print_file_status(STATUS_FILE_START, *files, 2);
} if ( (rc = encode_crypt(*files, remusr)) )
} log_error("%s: encryption failed: %s\n",
print_fname_stdin(*files), g10_errstr(rc) );
write_status( STATUS_FILE_DONE );
files++;
}
}
} }