From f6ca448ab70c52e923b7010aecdf7be9c0d4d4fc Mon Sep 17 00:00:00 2001 From: Vladimir Mezentsev Date: Mon, 9 Oct 2023 19:04:04 -0700 Subject: [PATCH] gprofng: Use the correct application name in error messages The old application name (er_archive) is used in many places. gprofng/ChangeLog 2023-10-09 Vladimir Mezentsev * src/Experiment.cc: Replace er_archive with gp-archive. * src/Experiment.cc: Likewise. --- gprofng/src/Experiment.cc | 54 +++++++++++++++++++-------------------- gprofng/src/gp-archive.cc | 25 +++++++++--------- 2 files changed, 40 insertions(+), 39 deletions(-) diff --git a/gprofng/src/Experiment.cc b/gprofng/src/Experiment.cc index cb54fe60fc3..1378ad5ce07 100644 --- a/gprofng/src/Experiment.cc +++ b/gprofng/src/Experiment.cc @@ -662,7 +662,7 @@ Experiment::ExperimentHandler::startElement (char*, char*, char *qName, Attribut else if (strcmp (str, SP_JCMD_ARCHIVE) == 0) { StringBuilder sb; - sb.sprintf (GTXT ("er_archive run: XXXXXXX")); + sb.sprintf (GTXT ("gp-archive run: XXXXXXX")); exp->pprocq->append (new Emsg (CMSG_WARN, sb)); } else if (strcmp (str, SP_JCMD_SAMPLE) == 0) @@ -6471,14 +6471,14 @@ Experiment::copy_file_to_archive (const char *name, const char *aname, int hide_ { if (errno == EEXIST) return 0; - fprintf (stderr, GTXT ("er_archive: unable to copy `%s': %s\n"), + fprintf (stderr, GTXT ("gp-archive: unable to copy `%s': %s\n"), name, STR (strerror (errno))); return 1; } if (dbe_stat_file (name, NULL) != 0) { - fprintf (stderr, GTXT ("er_archive: cannot access file `%s': %s\n"), + fprintf (stderr, GTXT ("gp-archive: cannot access file `%s': %s\n"), name, STR (strerror (errno))); close (fd_w); return 1; @@ -6487,7 +6487,7 @@ Experiment::copy_file_to_archive (const char *name, const char *aname, int hide_ int fd_r = ::open64 (name, O_RDONLY); if (fd_r == -1) { - fprintf (stderr, GTXT ("er_archive: unable to open `%s': %s\n"), + fprintf (stderr, GTXT ("gp-archive: unable to open `%s': %s\n"), name, strerror (errno)); close (fd_w); unlink (aname); @@ -6507,7 +6507,7 @@ Experiment::copy_file_to_archive (const char *name, const char *aname, int hide_ n1 = (int) write (fd_w, buf, n); if (n != n1) { - fprintf (stderr, GTXT ("er_archive: unable to write %d bytes to `%s': %s\n"), + fprintf (stderr, GTXT ("gp-archive: unable to write %d bytes to `%s': %s\n"), n, aname, STR (strerror (errno))); do_unlink = true; break; @@ -6527,7 +6527,7 @@ Experiment::copy_file_to_archive (const char *name, const char *aname, int hide_ if (do_unlink) { if (!hide_msg) - fprintf (stderr, GTXT ("er_archive: remove %s\n"), aname); + fprintf (stderr, GTXT ("gp-archive: remove %s\n"), aname); unlink (aname); return 1; } @@ -6556,11 +6556,11 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, if (!name || !aname || !common_archive) { if (!name) - fprintf (stderr, GTXT ("er_archive: Internal error: file name is NULL\n")); + fprintf (stderr, GTXT ("gp-archive: Internal error: file name is NULL\n")); if (!aname) - fprintf (stderr, GTXT ("er_archive: Internal error: file name in archive is NULL\n")); + fprintf (stderr, GTXT ("gp-archive: Internal error: file name in archive is NULL\n")); if (!common_archive) - fprintf (stderr, GTXT ("er_archive: Internal error: path to common archive is NULL\n")); + fprintf (stderr, GTXT ("gp-archive: Internal error: path to common archive is NULL\n")); return 1; } // Check if file is already archived @@ -6574,19 +6574,19 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, long size = pathconf (NTXT ("."), _PC_PATH_MAX); if (size < 0) { - fprintf (stderr, GTXT ("er_archive: Fatal error: pathconf(\".\", _PC_PATH_MAX) failed\n")); + fprintf (stderr, GTXT ("gp-archive: Fatal error: pathconf(\".\", _PC_PATH_MAX) failed\n")); return 1; } char *buf = (char *) malloc ((size_t) size); if (buf == NULL) { - fprintf (stderr, GTXT ("er_archive: Fatal error: unable to allocate memory\n")); + fprintf (stderr, GTXT ("gp-archive: Fatal error: unable to allocate memory\n")); return 1; } char *ptr = getcwd (buf, (size_t) size); if (ptr == NULL) { - fprintf (stderr, GTXT ("er_archive: Fatal error: cannot determine current directory\n")); + fprintf (stderr, GTXT ("gp-archive: Fatal error: cannot determine current directory\n")); free (buf); return 1; } @@ -6614,12 +6614,12 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, free (abs_aname); if (NULL != errmsg) { - fprintf (stderr, GTXT ("er_archive: Fatal error: %s\n"), errmsg); + fprintf (stderr, GTXT ("gp-archive: Fatal error: %s\n"), errmsg); free (errmsg); return 1; } fprintf (stderr, - GTXT ("er_archive: Fatal error: get_cksum(%s) returned %d\n"), + GTXT ("gp-archive: Fatal error: get_cksum(%s) returned %d\n"), name, crcval); return 1; } @@ -6631,7 +6631,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, free (cad); free (abs_aname); fprintf (stderr, - GTXT ("er_archive: Fatal error: unable to allocate memory\n")); + GTXT ("gp-archive: Fatal error: unable to allocate memory\n")); return 1; } // Check if full name is not too long @@ -6639,7 +6639,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, long max = pathconf (cad, _PC_PATH_MAX); if ((max < 0) || (len <= 0)) { // unknown error - fprintf (stderr, GTXT ("er_archive: Fatal error: pathconf(%s, _PC_PATH_MAX) failed\n"), + fprintf (stderr, GTXT ("gp-archive: Fatal error: pathconf(%s, _PC_PATH_MAX) failed\n"), cad); free (abs_caname); free (cad); @@ -6654,7 +6654,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, // Yes, we can do it abs_caname[max - 1] = 0; if (!hide_msg) - fprintf (stderr, GTXT ("er_archive: file path is too long - truncated:%s\n"), + fprintf (stderr, GTXT ("gp-gp-archive: file path is too long - truncated:%s\n"), abs_caname); } } @@ -6664,7 +6664,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, max = pathconf (cad, _PC_NAME_MAX); if ((max < 0) || (len <= 0)) { // unknown error - fprintf (stderr, GTXT ("er_archive: Fatal error: pathconf(%s, _PC_NAME_MAX) failed\n"), + fprintf (stderr, GTXT ("gp-archive: Fatal error: pathconf(%s, _PC_NAME_MAX) failed\n"), cad); free (abs_caname); free (cad); @@ -6679,7 +6679,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, // Yes, we can do it cafname[max - 1] = 0; if (!hide_msg) - fprintf (stderr, GTXT ("er_archive: file name is too long - truncated:%s\n"), + fprintf (stderr, GTXT ("gp-archive: file name is too long - truncated:%s\n"), abs_caname); } } @@ -6694,7 +6694,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, res = copy_file_to_archive (name, t, hide_msg); // hide messages if (res != 0) { - fprintf (stderr, GTXT ("er_archive: Fatal error: cannot copy file %s to temporary file: %s\n"), + fprintf (stderr, GTXT ("gp-archive: Fatal error: cannot copy file %s to temporary file: %s\n"), name, t); unlink (t); free (t); @@ -6717,7 +6717,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, { if (errno != EEXIST) { - fprintf (stderr, GTXT ("er_archive: Fatal error: rename(%s, %s) returned error: %d\n"), + fprintf (stderr, GTXT ("gp-archive: Fatal error: rename(%s, %s) returned error: %d\n"), t, abs_caname, res); unlink (t); free (t); @@ -6741,7 +6741,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, char *rel_caname = dbe_sprintf ("%s/%s", common_archive, cafname); if (rel_caname == NULL) { - fprintf (stderr, GTXT ("er_archive: Fatal error: unable to allocate memory\n")); + fprintf (stderr, GTXT ("gp-archive: Fatal error: unable to allocate memory\n")); return 1; } lname = get_relative_link (rel_caname, aname); @@ -6751,7 +6751,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, { if (abs_aname == NULL) { - fprintf (stderr, GTXT ("er_archive: Fatal error: unable to allocate memory\n")); + fprintf (stderr, GTXT ("gp-archive: Fatal error: unable to allocate memory\n")); return 1; } lname = get_relative_link (abs_caname, abs_aname); @@ -6762,7 +6762,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, free (abs_aname); if (lname == NULL) { - fprintf (stderr, GTXT ("er_archive: Fatal error: unable to allocate memory\n")); + fprintf (stderr, GTXT ("gp-archive: Fatal error: unable to allocate memory\n")); return 1; } // Create symbolic link: aname -> lname @@ -6771,7 +6771,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, res = symlink (lname, aname); if (res != 0) { - fprintf (stderr, GTXT ("er_archive: Fatal error: symlink(%s, %s) returned error: %d (errno=%s)\n"), + fprintf (stderr, GTXT ("gp-archive: Fatal error: symlink(%s, %s) returned error: %d (errno=%s)\n"), lname, aname, res, strerror (errno)); free (abs_caname); free (lname); @@ -6783,7 +6783,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, } else { - fprintf (stderr, GTXT ("er_archive: Internal error: file does not exist in common archive: %s\n"), + fprintf (stderr, GTXT ("gp-archive: Internal error: file does not exist in common archive: %s\n"), abs_caname); res = 1; } @@ -6809,7 +6809,7 @@ Experiment::copy_file (char *name, char *aname, int hide_msg, char *common_archi common_archive, relative_path)) return 0; // Error. For now - fatal error. Message is already printed. - fprintf (stderr, GTXT ("er_archive: Fatal error: cannot copy file %s to common archive %s\n"), + fprintf (stderr, GTXT ("gp-archive: Fatal error: cannot copy file %s to common archive %s\n"), name, common_archive); return 1; } diff --git a/gprofng/src/gp-archive.cc b/gprofng/src/gp-archive.cc index 89e3da8c0bd..af6065650c1 100644 --- a/gprofng/src/gp-archive.cc +++ b/gprofng/src/gp-archive.cc @@ -278,7 +278,7 @@ er_archive::start (int argc, char *argv[]) if (founder_exp->get_status () == Experiment::FAILURE) { if (!quiet) - fprintf (stderr, GTXT ("er_archive: %s: %s\n"), argv[last], + fprintf (stderr, GTXT ("gp-archive: %s: %s\n"), argv[last], pr_mesgs (founder_exp->fetch_errors (), NTXT (""), NTXT (""))); exit (1); } @@ -315,8 +315,8 @@ er_archive::start (int argc, char *argv[]) if (exp->get_status () == Experiment::FAILURE) { if (!quiet) - fprintf (stderr, GTXT ("er_archive: %s: %s\n"), exp_path, - pr_mesgs (exp->fetch_errors (), NTXT (""), NTXT (""))); + fprintf (stderr, GTXT ("gp-archive: %s: %s\n"), exp_path, + pr_mesgs (exp->fetch_errors (), "", "")); delete exp; continue; } @@ -362,7 +362,7 @@ er_archive::start (int argc, char *argv[]) if (elf && (lo->checksum != 0) && (lo->checksum != elf->elf_checksum ())) { if (!quiet) - fprintf (stderr, GTXT ("er_archive: '%s' has an unexpected checksum value; perhaps it was rebuilt. File ignored\n"), + fprintf (stderr, GTXT ("gp-archive: '%s' has an unexpected checksum value; perhaps it was rebuilt. File ignored\n"), df->get_location ()); continue; } @@ -480,12 +480,13 @@ er_archive::start (int argc, char *argv[]) for (long i = 0, sz = notfound_files->size (); i < sz; i++) { DbeFile *df = notfound_files->get (i); - fprintf (stderr, GTXT ("er_archive: Cannot find file: `%s'\n"), df->get_name ()); + fprintf (stderr, GTXT ("gp-archive: Cannot find file: `%s'\n"), df->get_name ()); } - fprintf (stderr, GTXT ("\n If you know the correct location of the missing file(s)" - " you can help %s to find them by manually editing the .gprofng.rc file." - " See %s man pages for more details.\n"), - whoami, whoami); + fprintf (stderr, + GTXT ("\n If you know the correct location of the missing file(s)" + " you can help gp-archive to find them by manually editing" + " the .gprofng.rc file." + " See the gp-archive man page for more details.\n")); } delete notfound_files; } @@ -588,21 +589,21 @@ er_archive::check_args (int argc, char *argv[]) int fd = open (optarg, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (fd == -1) { - fprintf (stderr, GTXT ("er_archive: Can't open %s: %s\n"), + fprintf (stderr, GTXT ("gp-archive: Can't open %s: %s\n"), optarg, strerror (errno)); break; } if (dup2 (fd, 2) == -1) { close (fd); - fprintf (stderr, GTXT ("er_archive: Can't divert stderr: %s\n"), + fprintf (stderr, GTXT ("gp-archive: Can't divert stderr: %s\n"), strerror (errno)); break; } if (dup2 (fd, 1) == -1) { close (fd); - fprintf (stderr, GTXT ("er_archive: Can't divert stdout: %s\n"), + fprintf (stderr, GTXT ("gp-archive: Can't divert stdout: %s\n"), strerror (errno)); break; } -- 2.30.2