diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ccidmon.c | 4 | ||||
| -rw-r--r-- | tools/gpg-check-pattern.c | 8 | ||||
| -rw-r--r-- | tools/gpg-connect-agent.c | 52 | ||||
| -rw-r--r-- | tools/gpgconf-comp.c | 30 | ||||
| -rw-r--r-- | tools/gpgconf.c | 6 | ||||
| -rw-r--r-- | tools/gpgparsemail.c | 8 | ||||
| -rw-r--r-- | tools/gpgsplit.c | 14 | ||||
| -rw-r--r-- | tools/gpgtar-create.c | 88 | ||||
| -rw-r--r-- | tools/gpgtar-extract.c | 22 | ||||
| -rw-r--r-- | tools/gpgtar-list.c | 2 | ||||
| -rw-r--r-- | tools/gpgtar.c | 8 | ||||
| -rw-r--r-- | tools/rfc822parse.c | 4 | ||||
| -rw-r--r-- | tools/sockprox.c | 4 | ||||
| -rw-r--r-- | tools/symcryptrun.c | 10 | ||||
| -rw-r--r-- | tools/watchgnupg.c | 4 |
15 files changed, 132 insertions, 132 deletions
diff --git a/tools/ccidmon.c b/tools/ccidmon.c index f632c0d85..884eab1fb 100644 --- a/tools/ccidmon.c +++ b/tools/ccidmon.c @@ -641,7 +641,7 @@ parse_line (char *line, unsigned int lineno) char *event_type, *address, *data, *status, *datatag; if (debug) - printf ("line[%u] =`%s'\n", lineno, line); + printf ("line[%u] ='%s'\n", lineno, line); p = strtok (line, " "); if (!p) @@ -700,7 +700,7 @@ parse_line_sniffusb (char *line, unsigned int lineno) char *p; if (debug) - printf ("line[%u] =`%s'\n", lineno, line); + printf ("line[%u] ='%s'\n", lineno, line); p = strtok (line, " \t"); if (!p) diff --git a/tools/gpg-check-pattern.c b/tools/gpg-check-pattern.c index e6b8b276b..12922c6ac 100644 --- a/tools/gpg-check-pattern.c +++ b/tools/gpg-check-pattern.c @@ -263,7 +263,7 @@ read_file (const char *fname, size_t *r_length) nread = fread (buf+buflen, 1, NCHUNK, fp); if (nread < NCHUNK && ferror (fp)) { - log_error ("error reading `[stdin]': %s\n", strerror (errno)); + log_error ("error reading '[stdin]': %s\n", strerror (errno)); xfree (buf); return NULL; } @@ -280,13 +280,13 @@ read_file (const char *fname, size_t *r_length) fp = fopen (fname, "rb"); if (!fp) { - log_error ("can't open `%s': %s\n", fname, strerror (errno)); + log_error ("can't open '%s': %s\n", fname, strerror (errno)); return NULL; } if (fstat (fileno(fp), &st)) { - log_error ("can't stat `%s': %s\n", fname, strerror (errno)); + log_error ("can't stat '%s': %s\n", fname, strerror (errno)); fclose (fp); return NULL; } @@ -295,7 +295,7 @@ read_file (const char *fname, size_t *r_length) buf = xmalloc (buflen+1); if (fread (buf, buflen, 1, fp) != 1) { - log_error ("error reading `%s': %s\n", fname, strerror (errno)); + log_error ("error reading '%s': %s\n", fname, strerror (errno)); fclose (fp); xfree (buf); return NULL; diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c index 0ef52fc14..c22e12970 100644 --- a/tools/gpg-connect-agent.c +++ b/tools/gpg-connect-agent.c @@ -470,7 +470,7 @@ arithmetic_op (int operator, const char *operands) case '|': result = result || value; break; case '&': result = result && value; break; default: - log_error ("unknown arithmetic operator `%c'\n", operator); + log_error ("unknown arithmetic operator '%c'\n", operator); return NULL; } } @@ -581,7 +581,7 @@ get_var_ext (const char *name) result = xasprintf ("%d", (int)server_pid); else { - log_error ("invalid argument `%s' for variable function `get'\n", s); + log_error ("invalid argument '%s' for variable function 'get'\n", s); log_info ("valid are: cwd, " "{home,bin,lib,libexec,data}dir, serverpid\n"); result = NULL; @@ -640,7 +640,7 @@ get_var_ext (const char *name) } else { - log_error ("unknown variable function `%.*s'\n", (int)(s-name), name); + log_error ("unknown variable function '%.*s'\n", (int)(s-name), name); result = NULL; } @@ -914,14 +914,14 @@ do_sendfd (assuan_context_t ctx, char *line) fp = fopen (name, mode); if (!fp) { - log_error ("can't open `%s' in \"%s\" mode: %s\n", + log_error ("can't open '%s' in \"%s\" mode: %s\n", name, mode, strerror (errno)); return; } fd = fileno (fp); if (opt.verbose) - log_error ("file `%s' opened in \"%s\" mode, fd=%d\n", + log_error ("file '%s' opened in \"%s\" mode, fd=%d\n", name, mode, fd); rc = assuan_sendfd (ctx, INT2FD (fd) ); @@ -990,7 +990,7 @@ do_open (char *line) fp = fopen (name, mode); if (!fp) { - log_error ("can't open `%s' in \"%s\" mode: %s\n", + log_error ("can't open '%s' in \"%s\" mode: %s\n", name, mode, strerror (errno)); return; } @@ -1028,12 +1028,12 @@ do_open (char *line) open_fd_table[fd].handle = newhandle; } if (opt.verbose) - log_info ("file `%s' opened in \"%s\" mode, fd=%d (libc=%d)\n", + log_info ("file '%s' opened in \"%s\" mode, fd=%d (libc=%d)\n", name, mode, (int)open_fd_table[fd].handle, fd); set_int_var (varname, (int)open_fd_table[fd].handle); #else if (opt.verbose) - log_info ("file `%s' opened in \"%s\" mode, fd=%d\n", + log_info ("file '%s' opened in \"%s\" mode, fd=%d\n", name, mode, fd); set_int_var (varname, fd); #endif @@ -1234,7 +1234,7 @@ main (int argc, char **argv) for (i=0; i < argc; i++) if (argv[i][0] == '-' && argv[i][1] == '-') - log_info (_("NOTE: `%s' is not considered an option\n"), argv[i]); + log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]); } @@ -1273,7 +1273,7 @@ main (int argc, char **argv) if (opt_run && !(script_fp = fopen (opt_run, "r"))) { - log_error ("cannot open run file `%s': %s\n", + log_error ("cannot open run file '%s': %s\n", opt_run, strerror (errno)); exit (1); } @@ -1305,7 +1305,7 @@ main (int argc, char **argv) } if (opt.verbose) - log_info ("server `%s' started\n", *argv); + log_info ("server '%s' started\n", *argv); } else if (opt.raw_socket) @@ -1322,13 +1322,13 @@ main (int argc, char **argv) (opt.connect_flags & 1) ? ASSUAN_SOCKET_CONNECT_FDPASSING : 0); if (rc) { - log_error ("can't connect to socket `%s': %s\n", + log_error ("can't connect to socket '%s': %s\n", opt.raw_socket, gpg_strerror (rc)); exit (1); } if (opt.verbose) - log_info ("connection to socket `%s' established\n", opt.raw_socket); + log_info ("connection to socket '%s' established\n", opt.raw_socket); } else if (opt.tcp_socket) { @@ -1346,13 +1346,13 @@ main (int argc, char **argv) rc = assuan_socket_connect (ctx, opt.tcp_socket, 0, 0); if (rc) { - log_error ("can't connect to server `%s': %s\n", + log_error ("can't connect to server '%s': %s\n", opt.tcp_socket, gpg_strerror (rc)); exit (1); } if (opt.verbose) - log_info ("connection to socket `%s' established\n", url); + log_info ("connection to socket '%s' established\n", url); xfree (url); } @@ -1575,7 +1575,7 @@ main (int argc, char **argv) { current_datasink = fopen (fname, "wb"); if (!current_datasink) - log_error ("can't open `%s': %s\n", + log_error ("can't open '%s': %s\n", fname, strerror (errno)); } xfree (tmpline); @@ -1695,11 +1695,11 @@ main (int argc, char **argv) } else if (!(script_fp = fopen (p, "r"))) { - log_error ("cannot open run file `%s': %s\n", + log_error ("cannot open run file '%s': %s\n", p, strerror (errno)); } else if (opt.verbose) - log_info ("running commands from `%s'\n", p); + log_info ("running commands from '%s'\n", p); } else if (!strcmp (cmd, "while")) { @@ -1834,7 +1834,7 @@ main (int argc, char **argv) "/help Print this help."); } else - log_error (_("unknown command `%s'\n"), cmd ); + log_error (_("unknown command '%s'\n"), cmd ); continue; } @@ -1920,7 +1920,7 @@ handle_inquire (assuan_context_t ctx, char *line) if (!d) { if (opt.verbose) - log_info ("no handler for inquiry `%s' found\n", name); + log_info ("no handler for inquiry '%s' found\n", name); return 0; } @@ -1942,19 +1942,19 @@ handle_inquire (assuan_context_t ctx, char *line) fp = popen (d->file, "r"); #endif if (!fp) - log_error ("error executing `%s': %s\n", + log_error ("error executing '%s': %s\n", d->file, strerror (errno)); else if (opt.verbose) - log_error ("handling inquiry `%s' by running `%s'\n", + log_error ("handling inquiry '%s' by running '%s'\n", name, d->file); } else { fp = fopen (d->file, "rb"); if (!fp) - log_error ("error opening `%s': %s\n", d->file, strerror (errno)); + log_error ("error opening '%s': %s\n", d->file, strerror (errno)); else if (opt.verbose) - log_error ("handling inquiry `%s' by returning content of `%s'\n", + log_error ("handling inquiry '%s' by returning content of '%s'\n", name, d->file); } if (!fp) @@ -1970,7 +1970,7 @@ handle_inquire (assuan_context_t ctx, char *line) } } if (ferror (fp)) - log_error ("error reading from `%s': %s\n", d->file, strerror (errno)); + log_error ("error reading from '%s': %s\n", d->file, strerror (errno)); } rc = assuan_send_data (ctx, NULL, 0); @@ -1983,7 +1983,7 @@ handle_inquire (assuan_context_t ctx, char *line) { #ifndef HAVE_W32CE_SYSTEM if (pclose (fp)) - log_error ("error running `%s': %s\n", d->file, strerror (errno)); + log_error ("error running '%s': %s\n", d->file, strerror (errno)); #endif } else diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 0b39ac4de..d07ab5913 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -1064,7 +1064,7 @@ gpg_agent_runtime_change (int killflag) if (!err) err = gnupg_wait_process (pgmname, pid, 1, NULL); if (err) - gc_error (0, 0, "error running `%s%s': %s", + gc_error (0, 0, "error running '%s%s': %s", pgmname, " reloadagent", gpg_strerror (err)); gnupg_release_process (pid); } @@ -1097,7 +1097,7 @@ scdaemon_runtime_change (int killflag) if (!err) err = gnupg_wait_process (pgmname, pid, 1, NULL); if (err) - gc_error (0, 0, "error running `%s%s': %s", + gc_error (0, 0, "error running '%s%s': %s", pgmname, " scd killscd", gpg_strerror (err)); gnupg_release_process (pid); } @@ -1862,7 +1862,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend) NULL, &outfp, NULL, &pid); if (err) { - gc_error (1, 0, "could not gather active options from `%s': %s", + gc_error (1, 0, "could not gather active options from '%s': %s", pgmname, gpg_strerror (err)); } @@ -3403,7 +3403,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults, when running in syntax check mode. */ if (errno != ENOENT || !update) { - gc_error (0, errno, "can not open global config file `%s'", fname); + gc_error (0, errno, "can not open global config file '%s'", fname); result = -1; } xfree (fname); @@ -3437,7 +3437,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults, ; if (!*p) { - gc_error (0, 0, "missing rule at `%s', line %d", fname, lineno); + gc_error (0, 0, "missing rule at '%s', line %d", fname, lineno); result = -1; continue; } @@ -3446,7 +3446,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults, } else if (!in_rule) { - gc_error (0, 0, "continuation but no rule at `%s', line %d", + gc_error (0, 0, "continuation but no rule at '%s', line %d", fname, lineno); result = -1; continue; @@ -3466,7 +3466,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults, ; if (p == component) { - gc_error (0, 0, "missing component at `%s', line %d", + gc_error (0, 0, "missing component at '%s', line %d", fname, lineno); result = -1; continue; @@ -3477,7 +3477,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults, component_id = gc_component_find (component); if (component_id < 0) { - gc_error (0, 0, "unknown component at `%s', line %d", + gc_error (0, 0, "unknown component at '%s', line %d", fname, lineno); result = -1; } @@ -3489,7 +3489,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults, ; if (p == option) { - gc_error (0, 0, "missing option at `%s', line %d", + gc_error (0, 0, "missing option at '%s', line %d", fname, lineno); result = -1; continue; @@ -3501,7 +3501,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults, option_info = find_option (component_id, option, GC_BACKEND_ANY); if (!option_info) { - gc_error (0, 0, "unknown option at `%s', line %d", + gc_error (0, 0, "unknown option at '%s', line %d", fname, lineno); result = -1; } @@ -3517,7 +3517,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults, p = strchr (flags, ']'); if (!p) { - gc_error (0, 0, "syntax error in rule at `%s', line %d", + gc_error (0, 0, "syntax error in rule at '%s', line %d", fname, lineno); result = -1; continue; @@ -3554,7 +3554,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults, if (*value) { gc_error (0, 0, "flag \"default\" may not be combined " - "with a value at `%s', line %d", + "with a value at '%s', line %d", fname, lineno); result = -1; } @@ -3565,7 +3565,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults, ; else { - gc_error (0, 0, "unknown flag at `%s', line %d", + gc_error (0, 0, "unknown flag at '%s', line %d", fname, lineno); result = -1; } @@ -3641,11 +3641,11 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults, if (length < 0 || ferror (config)) { - gc_error (0, errno, "error reading from `%s'", fname); + gc_error (0, errno, "error reading from '%s'", fname); result = -1; } if (fclose (config)) - gc_error (0, errno, "error closing `%s'", fname); + gc_error (0, errno, "error closing '%s'", fname); xfree (line); diff --git a/tools/gpgconf.c b/tools/gpgconf.c index a2bba180c..c586bb3a3 100644 --- a/tools/gpgconf.c +++ b/tools/gpgconf.c @@ -130,7 +130,7 @@ get_outfp (estream_t *fp) { *fp = es_fopen (opt.outfile, "w"); if (!*fp) - gc_error (1, errno, "can not open `%s'", opt.outfile); + gc_error (1, errno, "can not open '%s'", opt.outfile); } else *fp = es_stdout; @@ -202,7 +202,7 @@ main (int argc, char **argv) for (i=0; i < argc; i++) if (argv[i][0] == '-' && argv[i][1] == '-') - log_info (_("NOTE: `%s' is not considered an option\n"), argv[i]); + log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]); } fname = argc ? *argv : NULL; @@ -383,7 +383,7 @@ main (int argc, char **argv) if (outfp != es_stdout) if (es_fclose (outfp)) - gc_error (1, errno, "error closing `%s'", opt.outfile); + gc_error (1, errno, "error closing '%s'", opt.outfile); return 0; } diff --git a/tools/gpgparsemail.c b/tools/gpgparsemail.c index 6265efc93..a8b3dc7a2 100644 --- a/tools/gpgparsemail.c +++ b/tools/gpgparsemail.c @@ -199,7 +199,7 @@ run_gnupg (int smime, int sig_fd, int data_fd, int *close_list) /* Send stdout to the bit bucket. */ fd = open ("/dev/null", O_WRONLY); if (fd == -1) - die ("can't open `/dev/null': %s", strerror (errno)); + die ("can't open '/dev/null': %s", strerror (errno)); if (fd != 1) { if (dup2 (fd, 1) == -1) @@ -517,7 +517,7 @@ message_cb (void *opaque, rfc822parse_event_t event, rfc822parse_t msg) strcpy (stpcpy (stpcpy (buf, s1), "/"), s2); assert (info->signing_protocol); if (strcmp (buf, info->signing_protocol)) - err ("invalid %s structure; expected `%s', found `%s'", + err ("invalid %s structure; expected '%s', found '%s'", info->is_smime? "S/MIME":"PGP/MIME", info->signing_protocol, buf); else @@ -654,7 +654,7 @@ parse_message (FILE *fp) /* Delay hashing of the CR/LF because the last line ending belongs to the next boundary. */ if (debug) - printf ("# hashing %s`%s'\n", info.hashing==2?"CR,LF+":"", line); + printf ("# hashing %s'%s'\n", info.hashing==2?"CR,LF+":"", line); if (opt_crypto) { if (info.hashing == 2) @@ -791,7 +791,7 @@ main (int argc, char **argv) { FILE *fp = fopen (*argv, "rb"); if (!fp) - die ("can't open `%s': %s", *argv, strerror (errno)); + die ("can't open '%s': %s", *argv, strerror (errno)); parse_message (fp); fclose (fp); } diff --git a/tools/gpgsplit.c b/tools/gpgsplit.c index 3f093c360..1c1cee45a 100644 --- a/tools/gpgsplit.c +++ b/tools/gpgsplit.c @@ -544,11 +544,11 @@ write_part (FILE *fpin, unsigned long pktlen, else { if (opt_verbose) - log_info ("writing `%s'\n", outname); + log_info ("writing '%s'\n", outname); fpout = fopen (outname, "wb"); if (!fpout) { - log_error ("error creating `%s': %s\n", outname, strerror(errno)); + log_error ("error creating '%s': %s\n", outname, strerror(errno)); /* stop right now, otherwise we would mess up the sequence of the part numbers */ g10_exit (1); @@ -747,11 +747,11 @@ write_part (FILE *fpin, unsigned long pktlen, ready: if ( !opt_no_split && fclose (fpout) ) - log_error ("error closing `%s': %s\n", outname, strerror (errno)); + log_error ("error closing '%s': %s\n", outname, strerror (errno)); return 0; write_error: - log_error ("error writing `%s': %s\n", outname, strerror (errno)); + log_error ("error writing '%s': %s\n", outname, strerror (errno)); if (!opt_no_split) fclose (fpout); return 2; @@ -864,7 +864,7 @@ split_packets (const char *fname) } else if ( !(fp = fopen (fname,"rb")) ) { - log_error ("can't open `%s': %s\n", fname, strerror (errno)); + log_error ("can't open '%s': %s\n", fname, strerror (errno)); return; } @@ -873,9 +873,9 @@ split_packets (const char *fname) if ( rc > 0 ) ; /* error already handled */ else if ( ferror (fp) ) - log_error ("error reading `%s': %s\n", fname, strerror (errno)); + log_error ("error reading '%s': %s\n", fname, strerror (errno)); else - log_error ("premature EOF while reading `%s'\n", fname ); + log_error ("premature EOF while reading '%s'\n", fname ); if ( fp != stdin ) fclose (fp); diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c index 3a18d7c69..fad6d57ae 100644 --- a/tools/gpgtar-create.c +++ b/tools/gpgtar-create.c @@ -77,12 +77,12 @@ fillup_entry_w32 (tar_header_t hdr) *p = '/'; if (!wfname) { - log_error ("error utf8-ing `%s': %s\n", hdr->name, w32_strerror (-1)); + log_error ("error utf8-ing '%s': %s\n", hdr->name, w32_strerror (-1)); return gpg_error_from_syserror (); } if (!GetFileAttributesExW (wfname, GetFileExInfoStandard, &fad)) { - log_error ("error stat-ing `%s': %s\n", hdr->name, w32_strerror (-1)); + log_error ("error stat-ing '%s': %s\n", hdr->name, w32_strerror (-1)); xfree (wfname); return gpg_error_from_syserror (); } @@ -108,9 +108,9 @@ fillup_entry_w32 (tar_header_t hdr) if ((attr & FILE_ATTRIBUTE_READONLY)) hdr->mode &= ~0200; /* Clear the user write bit. */ if ((attr & FILE_ATTRIBUTE_HIDDEN)) - hdr->mode &= ~0707; /* Clear all user and other bits. */ + hdr->mode &= ~0707; /* Clear all user and other bits. */ if ((attr & FILE_ATTRIBUTE_SYSTEM)) - hdr->mode |= 0004; /* Make it readable by other. */ + hdr->mode |= 0004; /* Make it readable by other. */ /* Only set the size for a regular file. */ if (hdr->typeflag == TF_REGULAR) @@ -130,7 +130,7 @@ fillup_entry_w32 (tar_header_t hdr) #endif /*HAVE_W32_SYSTEM*/ -/* Given a fresh header obje`<ct HDR with only the name field set, try +/* Given a fresh header object HDR with only the name field set, try to gather all available info. This is the POSIX version. */ #ifndef HAVE_W32_SYSTEM static gpg_error_t @@ -142,10 +142,10 @@ fillup_entry_posix (tar_header_t hdr) if (lstat (hdr->name, &sbuf)) { err = gpg_error_from_syserror (); - log_error ("error stat-ing `%s': %s\n", hdr->name, gpg_strerror (err)); + log_error ("error stat-ing '%s': %s\n", hdr->name, gpg_strerror (err)); return err; } - + if (S_ISREG (sbuf.st_mode)) hdr->typeflag = TF_REGULAR; else if (S_ISDIR (sbuf.st_mode)) @@ -158,7 +158,7 @@ fillup_entry_posix (tar_header_t hdr) hdr->typeflag = TF_FIFO; else if (S_ISLNK (sbuf.st_mode)) hdr->typeflag = TF_SYMLINK; - else + else hdr->typeflag = TF_NOTSUP; /* FIXME: Save DEV and INO? */ @@ -205,7 +205,7 @@ fillup_entry_posix (tar_header_t hdr) hdr->size = sbuf.st_size; hdr->mtime = sbuf.st_mtime; - + return 0; } #endif /*!HAVE_W32_SYSTEM*/ @@ -303,7 +303,7 @@ scan_directory (const char *dname, scanctrl_t scanctrl) if (!wfname) { err = gpg_error_from_syserror (); - log_error (_("error reading directory `%s': %s\n"), + log_error (_("error reading directory '%s': %s\n"), dname, gpg_strerror (err)); goto leave; } @@ -311,7 +311,7 @@ scan_directory (const char *dname, scanctrl_t scanctrl) if (hd == INVALID_HANDLE_VALUE) { err = gpg_error_from_syserror (); - log_error (_("error reading directory `%s': %s\n"), + log_error (_("error reading directory '%s': %s\n"), dname, w32_strerror (-1)); xfree (wfname); goto leave; @@ -319,7 +319,7 @@ scan_directory (const char *dname, scanctrl_t scanctrl) xfree (wfname); } - do + do { char *fname = wchar_to_utf8 (fi.cFileName); if (!fname) @@ -346,11 +346,11 @@ scan_directory (const char *dname, scanctrl_t scanctrl) err = 0; else { - err = gpg_error_from_syserror (); - log_error (_("error reading directory `%s': %s\n"), + err = gpg_error_from_syserror (); + log_error (_("error reading directory '%s': %s\n"), dname, w32_strerror (-1)); } - + leave: if (hd != INVALID_HANDLE_VALUE) FindClose (hd); @@ -366,16 +366,16 @@ scan_directory (const char *dname, scanctrl_t scanctrl) if (!dir) { err = gpg_error_from_syserror (); - log_error (_("error reading directory `%s': %s\n"), + log_error (_("error reading directory '%s': %s\n"), dname, gpg_strerror (err)); return err; } - + while ((de = readdir (dir))) { if (!strcmp (de->d_name, "." ) || !strcmp (de->d_name, "..")) continue; /* Skip self and parent dir entry. */ - + err = add_entry (dname, de->d_name, scanctrl); if (err) goto leave; @@ -410,10 +410,10 @@ scan_recursive (const char *dname, scanctrl_t scanctrl) if (hdr->typeflag == TF_DIRECTORY) { if (opt.verbose > 1) - log_info ("scanning directory `%s'\n", hdr->name); + log_info ("scanning directory '%s'\n", hdr->name); scan_recursive (hdr->name, scanctrl); } - + scanctrl->nestlevel--; return err; } @@ -434,7 +434,7 @@ pattern_valid_p (const char *pattern) || (*pattern >= 'A' && *pattern <= 'Z')) && pattern[1] == ':') return 0; /* Drive letter are not allowed either. */ -#endif /*HAVE_DRIVE_LETTERS*/ +#endif /*HAVE_DRIVE_LETTERS*/ return 1; /* Okay. */ } @@ -505,14 +505,14 @@ store_uname (char *buffer, size_t length, unsigned long uid) if (!initialized || uid != lastuid) { #ifdef HAVE_W32_SYSTEM - mem2str (lastuname, uid? "user":"root", sizeof lastuname); + mem2str (lastuname, uid? "user":"root", sizeof lastuname); #else struct passwd *pw = getpwuid (uid); lastuid = uid; initialized = 1; if (pw) - mem2str (lastuname, pw->pw_name, sizeof lastuname); + mem2str (lastuname, pw->pw_name, sizeof lastuname); else { log_info ("failed to get name for uid %lu\n", uid); @@ -534,14 +534,14 @@ store_gname (char *buffer, size_t length, unsigned long gid) if (!initialized || gid != lastgid) { #ifdef HAVE_W32_SYSTEM - mem2str (lastgname, gid? "users":"root", sizeof lastgname); + mem2str (lastgname, gid? "users":"root", sizeof lastgname); #else struct group *gr = getgrgid (gid); lastgid = gid; initialized = 1; if (gr) - mem2str (lastgname, gr->gr_name, sizeof lastgname); + mem2str (lastgname, gr->gr_name, sizeof lastgname); else { log_info ("failed to get name for gid %lu\n", gid); @@ -568,7 +568,7 @@ build_header (void *record, tar_header_t hdr) namelen = strlen (hdr->name); if (namelen < sizeof raw->name) memcpy (raw->name, hdr->name, namelen); - else + else { n = (namelen < sizeof raw->prefix)? namelen : sizeof raw->prefix; for (n--; n ; n--) @@ -584,12 +584,12 @@ build_header (void *record, tar_header_t hdr) else { err = gpg_error (GPG_ERR_TOO_LARGE); - log_error ("error storing file `%s': %s\n", + log_error ("error storing file '%s': %s\n", hdr->name, gpg_strerror (err)); return err; } } - + store_xoctal (raw->mode, sizeof raw->mode, hdr->mode); store_xoctal (raw->uid, sizeof raw->uid, hdr->uid); store_xoctal (raw->gid, sizeof raw->gid, hdr->gid); @@ -624,7 +624,7 @@ build_header (void *record, tar_header_t hdr) if (nread < 0) { err = gpg_error_from_syserror (); - log_error ("error reading symlink `%s': %s\n", + log_error ("error reading symlink '%s': %s\n", hdr->name, gpg_strerror (err)); return err; } @@ -659,7 +659,7 @@ write_file (estream_t stream, tar_header_t hdr) { if (gpg_err_code (err) == GPG_ERR_NOT_SUPPORTED) { - log_info ("skipping unsupported file `%s'\n", hdr->name); + log_info ("skipping unsupported file '%s'\n", hdr->name); err = 0; } return err; @@ -671,7 +671,7 @@ write_file (estream_t stream, tar_header_t hdr) if (!infp) { err = gpg_error_from_syserror (); - log_error ("can't open `%s': %s - skipped\n", + log_error ("can't open '%s': %s - skipped\n", hdr->name, gpg_strerror (err)); return err; } @@ -696,7 +696,7 @@ write_file (estream_t stream, tar_header_t hdr) if (nread != nbytes) { err = gpg_error_from_syserror (); - log_error ("error reading file `%s': %s%s\n", + log_error ("error reading file '%s': %s%s\n", hdr->name, gpg_strerror (err), any? " (file shrunk?)":""); goto leave; @@ -708,15 +708,15 @@ write_file (estream_t stream, tar_header_t hdr) } nread = es_fread (record, 1, 1, infp); if (nread) - log_info ("note: file `%s' has grown\n", hdr->name); + log_info ("note: file '%s' has grown\n", hdr->name); } leave: if (err) es_fclose (infp); else if ((err = es_fclose (infp))) - log_error ("error closing file `%s': %s\n", hdr->name, gpg_strerror (err)); - + log_error ("error closing file '%s': %s\n", hdr->name, gpg_strerror (err)); + return err; } @@ -767,7 +767,7 @@ gpgtar_create (char **inpattern) if (!pattern) break; /* End of array. */ inpattern++; - + if (!*pattern) continue; @@ -778,7 +778,7 @@ gpgtar_create (char **inpattern) int c; char namebuf[4096]; size_t n = 0; - + for (;;) { if ((c = es_getc (es_stdin)) == EOF) @@ -786,7 +786,7 @@ gpgtar_create (char **inpattern) if (es_ferror (es_stdin)) { err = gpg_error_from_syserror (); - log_error ("error reading `%s': %s\n", + log_error ("error reading '%s': %s\n", "[stdin]", strerror (errno)); goto leave; } @@ -799,7 +799,7 @@ gpgtar_create (char **inpattern) if (!skip_this) { skip_this = 1; - log_error ("error reading `%s': %s\n", + log_error ("error reading '%s': %s\n", "[stdin]", "filename too long"); } } @@ -811,7 +811,7 @@ gpgtar_create (char **inpattern) break; } } - + if (skip_this || n < 2) continue; @@ -829,11 +829,11 @@ gpgtar_create (char **inpattern) *p = '/'; if (opt.verbose > 1) - log_info ("scanning `%s'\n", pat); + log_info ("scanning '%s'\n", pat); start_tail = scanctrl->flist_tail; if (skip_this || !pattern_valid_p (pat)) - log_error ("skipping invalid name `%s'\n", pat); + log_error ("skipping invalid name '%s'\n", pat); else if (!add_entry (pat, NULL, scanctrl) && *start_tail && ((*start_tail)->typeflag & TF_DIRECTORY)) scan_recursive (pat, scanctrl); @@ -850,7 +850,7 @@ gpgtar_create (char **inpattern) if (!outstream) { err = gpg_error_from_syserror (); - log_error (_("can't create `%s': %s\n"), + log_error (_("can't create '%s': %s\n"), opt.outfile, gpg_strerror (err)); goto leave; } @@ -882,7 +882,7 @@ gpgtar_create (char **inpattern) } if (err) { - log_error ("creating tarball `%s' failed: %s\n", + log_error ("creating tarball '%s' failed: %s\n", es_fname_get (outstream), gpg_strerror (err)); if (outstream && outstream != es_stdout) es_fclose (outstream); diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c index bd5b3a432..d0e462083 100644 --- a/tools/gpgtar-extract.c +++ b/tools/gpgtar-extract.c @@ -56,7 +56,7 @@ extract_regular (estream_t stream, const char *dirname, if (!outfp) { err = gpg_error_from_syserror (); - log_error ("error creating `%s': %s\n", fname, gpg_strerror (err)); + log_error ("error creating '%s': %s\n", fname, gpg_strerror (err)); goto leave; } @@ -71,7 +71,7 @@ extract_regular (estream_t stream, const char *dirname, if (nwritten != nbytes) { err = gpg_error_from_syserror (); - log_error ("error writing `%s': %s\n", fname, gpg_strerror (err)); + log_error ("error writing '%s': %s\n", fname, gpg_strerror (err)); goto leave; } } @@ -79,12 +79,12 @@ extract_regular (estream_t stream, const char *dirname, leave: if (!err && opt.verbose) - log_info ("extracted `%s'\n", fname); + log_info ("extracted '%s'\n", fname); es_fclose (outfp); if (err && fname && outfp) { if (gnupg_remove (fname)) - log_error ("error removing incomplete file `%s': %s\n", + log_error ("error removing incomplete file '%s': %s\n", fname, gpg_strerror (gpg_error_from_syserror ())); } xfree (fname); @@ -137,13 +137,13 @@ extract_directory (const char *dirname, tar_header_t hdr) err = 0; } if (err) - log_error ("error creating directory `%s': %s\n", + log_error ("error creating directory '%s': %s\n", fname, gpg_strerror (err)); } leave: if (!err && opt.verbose) - log_info ("created `%s/'\n", fname); + log_info ("created '%s/'\n", fname); xfree (fname); return err; } @@ -159,7 +159,7 @@ extract (estream_t stream, const char *dirname, tar_header_t hdr) #ifdef HAVE_DOSISH_SYSTEM if (strchr (hdr->name, '\\')) { - log_error ("filename `%s' contains a backslash - " + log_error ("filename '%s' contains a backslash - " "can't extract on this system\n", hdr->name); return gpg_error (GPG_ERR_INV_NAME); } @@ -171,7 +171,7 @@ extract (estream_t stream, const char *dirname, tar_header_t hdr) || !strncmp (hdr->name, "../", 3) || (n >= 3 && !strcmp (hdr->name+n-3, "/.." ))) { - log_error ("filename `%s' as suspicious parts - not extracting\n", + log_error ("filename '%s' as suspicious parts - not extracting\n", hdr->name); return gpg_error (GPG_ERR_INV_NAME); } @@ -184,7 +184,7 @@ extract (estream_t stream, const char *dirname, tar_header_t hdr) { char record[RECORDSIZE]; - log_info ("unsupported file type %d for `%s' - skipped\n", + log_info ("unsupported file type %d for '%s' - skipped\n", (int)hdr->typeflag, hdr->name); for (err = 0, n=0; !err && n < hdr->nrecords; n++) err = read_record (stream, record); @@ -278,7 +278,7 @@ gpgtar_extract (const char *filename) if (!stream) { err = gpg_error_from_syserror (); - log_error ("error opening `%s': %s\n", filename, gpg_strerror (err)); + log_error ("error opening '%s': %s\n", filename, gpg_strerror (err)); return; } } @@ -316,7 +316,7 @@ gpgtar_extract (const char *filename) } if (opt.verbose) - log_info ("extracting to `%s/'\n", dirname); + log_info ("extracting to '%s/'\n", dirname); for (;;) { diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c index 6f999d64f..d525d24d7 100644 --- a/tools/gpgtar-list.c +++ b/tools/gpgtar-list.c @@ -282,7 +282,7 @@ gpgtar_list (const char *filename) if (!stream) { err = gpg_error_from_syserror (); - log_error ("error opening `%s': %s\n", filename, gpg_strerror (err)); + log_error ("error opening '%s': %s\n", filename, gpg_strerror (err)); return; } } diff --git a/tools/gpgtar.c b/tools/gpgtar.c index d71fe035a..3c3105456 100644 --- a/tools/gpgtar.c +++ b/tools/gpgtar.c @@ -234,7 +234,7 @@ main (int argc, char **argv) for (i=0; i < argc; i++) if (argv[i][0] == '-' && argv[i][1] == '-') - log_info (_("NOTE: `%s' is not considered an option\n"), argv[i]); + log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]); } switch (cmd) @@ -304,10 +304,10 @@ read_record (estream_t stream, void *record) { err = gpg_error_from_syserror (); if (es_ferror (stream)) - log_error ("error reading `%s': %s\n", + log_error ("error reading '%s': %s\n", es_fname_get (stream), gpg_strerror (err)); else - log_error ("error reading `%s': premature EOF " + log_error ("error reading '%s': premature EOF " "(size of last record: %zu)\n", es_fname_get (stream), nread); } @@ -330,7 +330,7 @@ write_record (estream_t stream, const void *record) if (nwritten != RECORDSIZE) { err = gpg_error_from_syserror (); - log_error ("error writing `%s': %s\n", + log_error ("error writing '%s': %s\n", es_fname_get (stream), gpg_strerror (err)); } else diff --git a/tools/rfc822parse.c b/tools/rfc822parse.c index dd8b31601..a70f6a4e7 100644 --- a/tools/rfc822parse.c +++ b/tools/rfc822parse.c @@ -1155,7 +1155,7 @@ show_param (rfc822parse_field_t ctx, const char *name) return; s = rfc822parse_query_parameter (ctx, name, 0); if (s) - printf ("*** %s: `%s'\n", name, s); + printf ("*** %s: '%s'\n", name, s); } @@ -1202,7 +1202,7 @@ msg_cb (void *dummy_arg, rfc822parse_event_t event, rfc822parse_t msg) const char *s1, *s2; s1 = rfc822parse_query_media_type (ctx, &s2); if (s1) - printf ("*** media: `%s/%s'\n", s1, s2); + printf ("*** media: '%s/%s'\n", s1, s2); else printf ("*** media: [not found]\n"); show_param (ctx, "boundary"); diff --git a/tools/sockprox.c b/tools/sockprox.c index 38648f066..9ec89ce25 100644 --- a/tools/sockprox.c +++ b/tools/sockprox.c @@ -271,9 +271,9 @@ io_loop (FILE *client, FILE *server, FILE *protocol) -/* Set the `O_NONBLOCK' flag of DESC if VALUE is nonzero, +/* Set the 'O_NONBLOCK' flag of DESC if VALUE is nonzero, or clear the flag if VALUE is 0. - Return 0 on success, or -1 on error with `errno' set. */ + Return 0 on success, or -1 on error with 'errno' set. */ int set_nonblock_flag (int desc, int value) diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c index 942fafa09..4074c6ec9 100644 --- a/tools/symcryptrun.c +++ b/tools/symcryptrun.c @@ -99,10 +99,10 @@ /* From simple-gettext.c. */ -/* We assume to have `unsigned long int' value with at least 32 bits. */ +/* We assume to have 'unsigned long int' value with at least 32 bits. */ #define HASHWORDBITS 32 -/* The so called `hashpjw' function by P.J. Weinberger +/* The so called 'hashpjw' function by P.J. Weinberger [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, 1986, 1987 Bell Telephone Laboratories, Inc.] */ @@ -228,7 +228,7 @@ my_strusage (int level) /* This is in the GNU C library in unistd.h. */ #ifndef TEMP_FAILURE_RETRY -/* Evaluate EXPRESSION, and repeat as long as it returns -1 with `errno' +/* Evaluate EXPRESSION, and repeat as long as it returns -1 with 'errno' set to EINTR. */ # define TEMP_FAILURE_RETRY(expression) \ @@ -318,7 +318,7 @@ confucius_mktmpdir (void) name = xstrconcat (p, "/", "gpg-XXXXXX", NULL); if (!name || !mkdtemp (name)) { - log_error (_("can't create temporary directory `%s': %s\n"), + log_error (_("can't create temporary directory '%s': %s\n"), name?name:"", strerror (errno)); return NULL; } @@ -935,7 +935,7 @@ main (int argc, char **argv) { if (!default_config) { - log_error (_("option file `%s': %s\n"), + log_error (_("option file '%s': %s\n"), configname, strerror(errno) ); exit(1); } diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c index 592819be0..1bd9e8003 100644 --- a/tools/watchgnupg.c +++ b/tools/watchgnupg.c @@ -369,7 +369,7 @@ main (int argc, char **argv) if (server_un == -1) die ("socket(PF_LOCAL) failed: %s\n", strerror (errno)); if (verbose) - fprintf (stderr, "listening on socket `%s'\n", *argv); + fprintf (stderr, "listening on socket '%s'\n", *argv); } else server_un = -1; @@ -428,7 +428,7 @@ main (int argc, char **argv) goto again; } else - die ("bind to `%s' failed: %s\n", *argv, strerror (errno)); + die ("bind to '%s' failed: %s\n", *argv, strerror (errno)); } if (server_in != -1 && listen (server_in, 5)) |