texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * info/info.c (get_initial_file), * info/infodoc.


From: Gavin D. Smith
Subject: branch master updated: * info/info.c (get_initial_file), * info/infodoc.c (info_get_info_help_node), * info/nodes.c (info_get_node_with_defaults): Use strcmp or strcasecmp instead of mbscasecmp in several cases where we do not care about case-insensitive matching with non-ASCII characters.
Date: Thu, 19 Oct 2023 08:20:49 -0400

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 0d6c91ad59 * info/info.c (get_initial_file), * info/infodoc.c 
(info_get_info_help_node), * info/nodes.c (info_get_node_with_defaults): Use 
strcmp or strcasecmp instead of mbscasecmp in several cases where we do not 
care about case-insensitive matching with non-ASCII characters.
0d6c91ad59 is described below

commit 0d6c91ad596544f221c4c83062de9def1523ba62
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Thu Oct 19 13:20:39 2023 +0100

    * info/info.c (get_initial_file),
    * info/infodoc.c (info_get_info_help_node),
    * info/nodes.c (info_get_node_with_defaults):
    Use strcmp or strcasecmp instead of mbscasecmp in several
    cases where we do not care about case-insensitive matching with
    non-ASCII characters.
---
 ChangeLog      | 9 +++++++++
 info/info.c    | 2 +-
 info/infodoc.c | 3 +--
 info/nodes.c   | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5bd1d0337e..8c7e75eb9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2023-10-19  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * info/info.c (get_initial_file),
+       * info/infodoc.c (info_get_info_help_node),
+       * info/nodes.c (info_get_node_with_defaults):
+       Use strcmp or strcasecmp instead of mbscasecmp in several
+       cases where we do not care about case-insensitive matching with
+       non-ASCII characters.
+
 2023-10-19  Gavin Smith <gavinsmith0123@gmail.com>
 
        * tp/maintain/change_perl_modules_version.sh:
diff --git a/info/info.c b/info/info.c
index 8ca4a17e58..d7a6afaa2c 100644
--- a/info/info.c
+++ b/info/info.c
@@ -250,7 +250,7 @@ get_initial_file (int *argc, char ***argv, char **error)
     {
       /* If they say info info (or info -O info, etc.), show them 
          info-stnd.texi.  (Get info.texi with info -f info.) */
-      if ((*argv)[0] && mbscasecmp ((*argv)[0], "info") == 0)
+      if ((*argv)[0] && strcmp ((*argv)[0], "info") == 0)
         (*argv)[0] = "info-stnd";
 
       entry = lookup_dir_entry ((*argv)[0], 0);
diff --git a/info/infodoc.c b/info/infodoc.c
index f5278bbb48..2b7b752708 100644
--- a/info/infodoc.c
+++ b/info/infodoc.c
@@ -357,8 +357,7 @@ DECLARE_INFO_COMMAND (info_get_info_help_node, _("Visit 
Info node '(info)Help'")
     for (win = windows; win; win = win->next)
       {
         if (win->node && win->node->fullpath
-            && !mbscasecmp ("info",
-                            filename_non_directory (win->node->fullpath))
+            && !strcmp (filename_non_directory (win->node->fullpath), "info")
             && (!strcmp (win->node->nodename, "Help")
                 || !strcmp (win->node->nodename, "Help-Small-Screen")))
           {
diff --git a/info/nodes.c b/info/nodes.c
index ebd4d7a288..1152c7056b 100644
--- a/info/nodes.c
+++ b/info/nodes.c
@@ -981,7 +981,7 @@ info_get_node_with_defaults (char *filename_in, char 
*nodename_in,
       goto cleanup_and_exit;
     }
 
-  if (mbscasecmp (filename, MANPAGE_FILE_BUFFER_NAME) == 0)
+  if (strcmp (filename, MANPAGE_FILE_BUFFER_NAME) == 0)
     {
       node = get_manpage_node (nodename);
       goto cleanup_and_exit;
@@ -997,7 +997,7 @@ info_get_node_with_defaults (char *filename_in, char 
*nodename_in,
     }
 
   /* If the node not found was "Top", try again with different case. */
-  if (!node && (nodename && mbscasecmp (nodename, "Top") == 0))
+  if (!node && (nodename && strcasecmp (nodename, "Top") == 0))
     {
       node = info_get_node_of_file_buffer (file_buffer, "Top");
       if (!node)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]