remove all instances of charcpy() and replace them with strncpy(), for

ease of maintenance

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2758 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 484fbd76d8fa0f6cc5dfba72d4c25e440097d712..57673256e7733e4e1860d785885bdae59aa52edc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,11 +29,11 @@ CVS code -
          get_history_completion(), do_search(), do_replace(),
          nanogetstr(), and statusq(); removal of remove_node() and
          insert_node(). (DLR)
-       - Replace more instances of strncpy() with charcpy(), since the
-         only difference between them is that the former pads strings
-         with nulls when they're longer than the number of characters
-         specified, which isn't always used.  Changes to input_tab(),
-         do_enter(), replace_regexp(), and replace_line(). (DLR)
+       - Remove all instances of charcpy() and replace them with
+         strncpy(), since there's no way to be sure that a charcpy()ed
+         string will always be properly null-terminated, and strcpy()'s
+         null termination is the only difference between it and
+         charcpy(). (DLR)
        - When using a backup directory, make sure all the filenames
          written are unique by using get_next_filename() when
          necessary.  Changes to get_next_filename(), write_file(),

diff --git a/src/files.c b/src/files.c
index 71e0a332ea48af46ba1c96b28abc320458020cc8..f1c937efe6c1b9c0723bae7d4386430d9cc77744 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2277,7 +2277,7 @@ char *input_tab(char *buf, size_t *place, bool *lastwastab, bool *list)
            buf = charealloc(buf, common_len + buf_len - *place + 1);
            charmove(buf + common_len, buf + *place,
                buf_len - *place + 1);
-           charcpy(buf, mzero, common_len);
+           strncpy(buf, mzero, common_len);
            *place = common_len;
        } else if (*lastwastab == FALSE || num_matches < 2)
            *lastwastab = TRUE;

diff --git a/src/nano.c b/src/nano.c
index 0e30458791f1e782195ca8146e3c6c78c7a2b717..951b909c3faa30fd84a9008902e89bb32b8ac945 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -1439,7 +1439,7 @@ void do_enter(void)
     strcpy(&newnode->data[extra], current->data + current_x);
 #ifndef NANO_SMALL
     if (ISSET(AUTOINDENT)) {
-       charcpy(newnode->data, current->data, extra);
+       strncpy(newnode->data, current->data, extra);
        totsize += mbstrlen(newnode->data);
     }
 #endif
@@ -1875,7 +1875,7 @@ bool do_wrap(filestruct *line)
 #ifndef NANO_SMALL
     if (ISSET(AUTOINDENT)) {
        /* Copy the indentation. */
-       charcpy(new_line, indent_string, indent_len);
+       strncpy(new_line, indent_string, indent_len);
        new_line[indent_len] = '\0';
        new_line_len += indent_len;
     }
@@ -2657,7 +2657,7 @@ void justify_format(filestruct *paragraph, size_t skip)
 
     end = paragraph->data + skip;
     new_paragraph_data = charalloc(strlen(paragraph->data) + 1);
-    charcpy(new_paragraph_data, paragraph->data, skip);
+    strncpy(new_paragraph_data, paragraph->data, skip);
     new_end = new_paragraph_data + skip;
 
     while (*end != '\0') {
@@ -3323,7 +3323,7 @@ void do_justify(bool full_justify)
             * current line to the next line. */
            current->next->data = charalloc(indent_len + 1 + line_len -
                break_pos);
-           charcpy(current->next->data, indent_string, indent_len);
+           strncpy(current->next->data, indent_string, indent_len);
            strcpy(current->next->data + indent_len, current->data +
                break_pos);
 
@@ -4048,7 +4048,7 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
        charmove(&current->data[current_x + char_buf_len],
                &current->data[current_x],
                current_len - current_x + char_buf_len);
-       charcpy(&current->data[current_x], char_buf, char_buf_len);
+       strncpy(&current->data[current_x], char_buf, char_buf_len);
        current_len += char_buf_len;
        totsize++;
        set_modified();

diff --git a/src/nano.h b/src/nano.h
index 440d5d4c7718229297baffee840cf3d4b46bcb29..eb8a115e6c23d02449aff89f2983353c1fa23a34 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -49,7 +49,6 @@
 #define charalloc(howmuch) (char *)nmalloc((howmuch) * sizeof(char))
 #define charealloc(ptr, howmuch) (char *)nrealloc(ptr, (howmuch) * sizeof(char))
 #define charmove(dest, src, n) memmove(dest, src, (n) * sizeof(char))
-#define charcpy(dest, src, n) memcpy(dest, src, (n) * sizeof(char))
 #define charset(dest, src, n) memset(dest, src, (n) * sizeof(char))
 
 /* Other macros. */

diff --git a/src/search.c b/src/search.c
index 9ec0329afb7698a7d75817e30fd513fa6ac7f7e8..a50d018127b63c702189044913ca79d376c5173a 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -613,7 +613,7 @@ int replace_regexp(char *string, bool create)
            /* And if create is TRUE, append the result of the
             * subexpression match to the new line. */
            if (create) {
-               charcpy(string, current->data + current_x +
+               strncpy(string, current->data + current_x +
                        regmatches[num].rm_so, i);
                string += i;
            }
@@ -650,7 +650,7 @@ char *replace_line(const char *needle)
     copy = charalloc(new_line_size);
 
     /* The head of the original line. */
-    charcpy(copy, current->data, current_x);
+    strncpy(copy, current->data, current_x);
 
     /* The replacement text. */
 #ifdef HAVE_REGEX_H

diff --git a/src/winio.c b/src/winio.c
index ea516fc2ca0b6a40607f6d2c565cc474a04ff24e..6935be41bb395226057fb9caa93909f90ad1fcea 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -2101,7 +2101,7 @@ void do_statusbar_output(char *output, size_t output_len, bool
        charmove(&answer[statusbar_x + char_buf_len],
                &answer[statusbar_x], answer_len - statusbar_x +
                char_buf_len);
-       charcpy(&answer[statusbar_x], char_buf, char_buf_len);
+       strncpy(&answer[statusbar_x], char_buf, char_buf_len);
        answer_len += char_buf_len;
 
        do_statusbar_right();