diff options
Diffstat (limited to 'g13')
| -rw-r--r-- | g13/be-encfs.c | 14 | ||||
| -rw-r--r-- | g13/call-gpg.c | 2 | ||||
| -rw-r--r-- | g13/create.c | 6 | ||||
| -rw-r--r-- | g13/g13.c | 12 | ||||
| -rw-r--r-- | g13/mount.c | 22 | ||||
| -rw-r--r-- | g13/mountinfo.c | 2 | ||||
| -rw-r--r-- | g13/runner.c | 2 |
7 files changed, 30 insertions, 30 deletions
diff --git a/g13/be-encfs.c b/g13/be-encfs.c index ae0ec1cf9..265b4c2bc 100644 --- a/g13/be-encfs.c +++ b/g13/be-encfs.c @@ -82,7 +82,7 @@ run_umount_helper (const char *mountpoint) err = gnupg_spawn_process_detached (pgmname, args, NULL); if (err) - log_error ("failed to run `%s': %s\n", + log_error ("failed to run '%s': %s\n", pgmname, gpg_strerror (err)); } @@ -100,7 +100,7 @@ handle_status_line (runner_t runner, const char *line, { for (line +=8; *line && spacep (line); line++) ; - log_info ("got status `%s'\n", line); + log_info ("got status '%s'\n", line); if (!strcmp (line, "fuse_main_start")) { /* Send a special error code back to let the caller know @@ -114,7 +114,7 @@ handle_status_line (runner_t runner, const char *line, { for (line +=8; *line && spacep (line); line++) ; - log_info ("got prompt `%s'\n", line); + log_info ("got prompt '%s'\n", line); if (!strcmp (line, "create_root_dir")) err = send_cmd (runner, cmd == ENCFS_CMD_CREATE? "y":"n"); else if (!strcmp (line, "create_mount_point")) @@ -270,7 +270,7 @@ run_encfs_tool (ctrl_t ctrl, enum encfs_cmds cmd, outbound[0], -1, inbound[1], &pid); if (err) { - log_error ("error spawning `%s': %s\n", pgmname, gpg_strerror (err)); + log_error ("error spawning '%s': %s\n", pgmname, gpg_strerror (err)); goto leave; } close (outbound[0]); outbound[0] = -1; @@ -291,7 +291,7 @@ run_encfs_tool (ctrl_t ctrl, enum encfs_cmds cmd, goto leave; *r_id = runner_get_rid (runner); - log_info ("running `%s' in the background\n", pgmname); + log_info ("running '%s' in the background\n", pgmname); leave: if (inbound[0] != -1) @@ -418,7 +418,7 @@ be_encfs_create_container (ctrl_t ctrl, const char *fname, tupledesc_t tuples, if (!mkdtemp (mountpoint)) { err = gpg_error_from_syserror (); - log_error (_("can't create directory `%s': %s\n"), + log_error (_("can't create directory '%s': %s\n"), "/tmp/.#g13_XXXXXX", gpg_strerror (err)); goto leave; } @@ -428,7 +428,7 @@ be_encfs_create_container (ctrl_t ctrl, const char *fname, tupledesc_t tuples, /* In any case remove the temporary mount point. */ if (rmdir (mountpoint)) - log_error ("error removing temporary mount point `%s': %s\n", + log_error ("error removing temporary mount point '%s': %s\n", mountpoint, gpg_strerror (gpg_error_from_syserror ())); diff --git a/g13/call-gpg.c b/g13/call-gpg.c index 93b91d5e7..316082a72 100644 --- a/g13/call-gpg.c +++ b/g13/call-gpg.c @@ -64,7 +64,7 @@ start_gpg (ctrl_t ctrl, int input_fd, int output_fd, assuan_context_t *r_ctx) opt.gpg_program = gnupg_module_name (GNUPG_MODULE_NAME_GPG); if (opt.verbose) - log_info (_("no running gpg - starting `%s'\n"), opt.gpg_program); + log_info (_("no running gpg - starting '%s'\n"), opt.gpg_program); /* Compute argv[0]. */ if ( !(pgmname = strrchr (opt.gpg_program, '/'))) diff --git a/g13/create.c b/g13/create.c index f907ddbf6..315ff1337 100644 --- a/g13/create.c +++ b/g13/create.c @@ -135,7 +135,7 @@ write_keyblob (const char *filename, if (!fp) { err = gpg_error_from_syserror (); - log_error ("error creating new container `%s': %s\n", + log_error ("error creating new container '%s': %s\n", filename, gpg_strerror (err)); return err; } @@ -197,7 +197,7 @@ write_keyblob (const char *filename, if (es_fclose (fp)) { err = gpg_error_from_syserror (); - log_error ("error closing `%s': %s\n", + log_error ("error closing '%s': %s\n", filename, gpg_strerror (err)); remove (filename); return err; @@ -208,7 +208,7 @@ write_keyblob (const char *filename, writeerr: err = gpg_error_from_syserror (); - log_error ("error writing header to `%s': %s\n", + log_error ("error writing header to '%s': %s\n", filename, gpg_strerror (err)); es_fclose (fp); remove (filename); @@ -273,7 +273,7 @@ set_debug (void) } else { - log_error (_("invalid debug-level `%s' given\n"), debug_level); + log_error (_("invalid debug-level '%s' given\n"), debug_level); g13_exit(2); } @@ -448,11 +448,11 @@ main ( int argc, char **argv) if (default_config) { if (parse_debug) - log_info (_("NOTE: no default option file `%s'\n"), configname); + log_info (_("NOTE: no default option file '%s'\n"), configname); } else { - log_error (_("option file `%s': %s\n"), + log_error (_("option file '%s': %s\n"), configname, strerror(errno)); g13_exit(2); } @@ -460,7 +460,7 @@ main ( int argc, char **argv) configname = NULL; } if (parse_debug && configname) - log_info (_("reading options from `%s'\n"), configname); + log_info (_("reading options from '%s'\n"), configname); default_config = 0; } @@ -606,7 +606,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]); } @@ -728,7 +728,7 @@ main ( int argc, char **argv) start_idle_task (); err = g13_mount_container (&ctrl, argv[0], argc == 2?argv[1]:NULL); if (err) - log_error ("error mounting container `%s': %s <%s>\n", + log_error ("error mounting container '%s': %s <%s>\n", *argv, gpg_strerror (err), gpg_strsource (err)); } break; diff --git a/g13/mount.c b/g13/mount.c index 62eeca1f7..ab9f2f340 100644 --- a/g13/mount.c +++ b/g13/mount.c @@ -55,24 +55,24 @@ parse_header (const char *filename, if (packet[0] != (0xc0|61) || len < 26 || memcmp (packet+6, "GnuPG/G13", 10)) { - log_error ("file `%s' is not valid container\n", filename); + log_error ("file '%s' is not valid container\n", filename); return gpg_error (GPG_ERR_INV_OBJ); } if (packet[16] != 1) { - log_error ("unknown version %u of container `%s'\n", + log_error ("unknown version %u of container '%s'\n", (unsigned int)packet[16], filename); return gpg_error (GPG_ERR_INV_OBJ); } if (packet[17] || packet[18] || packet[26] || packet[27] || packet[28] || packet[29] || packet[30] || packet[31]) - log_info ("WARNING: unknown meta information in `%s'\n", filename); + log_info ("WARNING: unknown meta information in '%s'\n", filename); if (packet[19]) - log_info ("WARNING: OS flag is not supported in `%s'\n", filename); + log_info ("WARNING: OS flag is not supported in '%s'\n", filename); if (packet[24] != 1 || packet[25] != 0) { - log_error ("meta data copies in `%s' are not supported\n", filename); + log_error ("meta data copies in '%s' are not supported\n", filename); return gpg_error (GPG_ERR_NOT_IMPLEMENTED); } @@ -82,7 +82,7 @@ parse_header (const char *filename, /* Do a basic sanity check on the length. */ if (len < 32 || len > 1024*1024) { - log_error ("bad length given in container `%s'\n", filename); + log_error ("bad length given in container '%s'\n", filename); return gpg_error (GPG_ERR_INV_OBJ); } @@ -107,7 +107,7 @@ read_keyblob_prefix (const char *filename, estream_t *r_fp, size_t *r_headerlen) if (!fp) { err = gpg_error_from_syserror (); - log_error ("error reading `%s': %s\n", filename, gpg_strerror (err)); + log_error ("error reading '%s': %s\n", filename, gpg_strerror (err)); return err; } @@ -115,7 +115,7 @@ read_keyblob_prefix (const char *filename, estream_t *r_fp, size_t *r_headerlen) if (es_fread (packet, 32, 1, fp) != 1) { err = gpg_error_from_syserror (); - log_error ("error reading the header of `%s': %s\n", + log_error ("error reading the header of '%s': %s\n", filename, gpg_strerror (err)); es_fclose (fp); return err; @@ -150,7 +150,7 @@ read_keyblob (const char *filename, goto leave; if (opt.verbose) - log_info ("header length of `%s' is %zu\n", filename, headerlen); + log_info ("header length of '%s' is %zu\n", filename, headerlen); /* Read everything including the padding. We should eventually do a regular OpenPGP parsing to detect the padding packet and pass @@ -173,7 +173,7 @@ read_keyblob (const char *filename, if (es_fread (msg, msglen, 1, fp) != 1) { err = gpg_error_from_syserror (); - log_error ("error reading keyblob of `%s': %s\n", + log_error ("error reading keyblob of '%s': %s\n", filename, gpg_strerror (err)); goto leave; } @@ -264,7 +264,7 @@ g13_mount_container (ctrl_t ctrl, const char *filename, const char *mountpoint) if (!mkdtemp (mountpoint_buffer)) { err = gpg_error_from_syserror (); - log_error (_("can't create directory `%s': %s\n"), + log_error (_("can't create directory '%s': %s\n"), "/tmp/g13-XXXXXX", gpg_strerror (err)); xfree (mountpoint_buffer); return err; diff --git a/g13/mountinfo.c b/g13/mountinfo.c index be83de712..e2de8d9c4 100644 --- a/g13/mountinfo.c +++ b/g13/mountinfo.c @@ -136,7 +136,7 @@ mountinfo_del_mount (const char *container, const char *mountpoint, not have completed yet. We should add the mountpoints to an idle queue and retry a remove. */ if (rmdir (m->mountpoint)) - log_error ("error removing mount point `%s': %s\n", + log_error ("error removing mount point '%s': %s\n", m->mountpoint, gpg_strerror (gpg_error_from_syserror ())); } diff --git a/g13/runner.c b/g13/runner.c index 7680d3d5b..905a0d149 100644 --- a/g13/runner.c +++ b/g13/runner.c @@ -375,7 +375,7 @@ runner_thread (void *arg) gnupg_release_process (runner->pid); runner->pid = (pid_t)(-1); if (err) - log_error ("running `%s' failed (exitcode=%d): %s\n", + log_error ("running '%s' failed (exitcode=%d): %s\n", runner->name, exitcode, gpg_strerror (err)); log_debug ("runner thread waiting finished\n"); } |