security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-07-02 02:48:57 +02:00
Code Activity

Fixed some typos.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -11,13 +11,14 @@
--delete-secret-key(s) and --delete-secret-and-public-key(s) as
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.
* g10.c (main): We don't need to check argc for encode_crypt_files
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.

83
g10/encode.c
View File

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