ncurses 5.5

[ncurses.git] / tack / edit.c

diff --git a/tack/edit.c b/tack/edit.c
index 5685d9253fe6a58d0d54eecc7732e10d2c590b13..2e0dda2bbee7d975514b81848dc9ecdb9f23d03e 100644 (file)
--- a/tack/edit.c
+++ b/tack/edit.c
@@ -15,15 +15,15 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with TACK; see the file COPYING.  If not, write to
-** the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA 02111-1307, USA.
+** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+** Boston, MA 02110-1301, USA
 */
 
 #include <tack.h>
 #include <time.h>
 #include <tic.h>
 
-MODULE_ID("$Id: edit.c,v 1.3 1999/06/16 00:43:43 tom Exp $")
+MODULE_ID("$Id: edit.c,v 1.10 2005/09/17 19:49:16 tom Exp $")
 
 /*
  * Terminfo edit features
@@ -52,7 +52,7 @@ struct test_list edit_test_list[] = {
 };
 
 static char change_pad_text[MAX_CHANGES][80];
-struct test_list change_pad_list[MAX_CHANGES] = {
+static struct test_list change_pad_list[MAX_CHANGES] = {
        {MENU_LAST, 0, 0, 0, 0, 0, 0}
 };
 
@@ -65,15 +65,13 @@ struct test_menu change_pad_menu = {
        build_change_menu, change_pad_list, 0, 0, 0
 };
 
-extern struct test_results *pads[STRCOUNT];    /* save pad results here */
-
 static TERMTYPE        original_term;          /* terminal type description */
 
 static char flag_boolean[BOOLCOUNT];   /* flags for booleans */
 static char flag_numerics[NUMCOUNT];   /* flags for numerics */
 static char flag_strings[STRCOUNT];    /* flags for strings */
 static int xon_index;                  /* Subscript for (xon) */
-int xon_shadow;
+static int xon_shadow;
 
 static int start_display;              /* the display has just started */
 static int display_lines;              /* number of lines displayed */
@@ -81,7 +79,7 @@ static int display_lines;             /* number of lines displayed */
 /*
 **     send_info_string(str)
 **
-**     Return the terminfo string prefixed by the correct seperator
+**     Return the terminfo string prefixed by the correct separator
 */
 static void
 send_info_string(
@@ -170,7 +168,7 @@ show_info(
 /*
 **     save_info_string(str, fp)
 **
-**     Write the terminfo string prefixed by the correct seperator
+**     Write the terminfo string prefixed by the correct separator
 */
 static void
 save_info_string(
@@ -341,7 +339,7 @@ show_value(
        switch (nt->nte_type) {
        case STRING:
                _nc_reset_input((FILE *) 0, buf);
-               _nc_trans_string(tmp);
+               _nc_trans_string(tmp, tmp + sizeof(tmp));
                s = (char *)malloc(strlen(tmp) + 1);
                strcpy(s, tmp);
                CUR Strings[nt->nte_index] = s;
@@ -556,18 +554,18 @@ mark_cap(
 **
 **     Scan the name list and get the names.
 **     Enter each name into the can-test data base.
-**     <space> ( and ) may be used as seperators.
+**     <space> ( and ) may be used as separators.
 */
 void
 can_test(
        const char *s,
        int flags)
 {
-       int ch, i, j;
+       int ch, j;
        char name[32];
 
        if (s) {
-               for (i = j = 0; (name[j] = ch = *s); s++) {
+               for (j = 0; (name[j] = ch = *s); s++) {
                        if (ch == ' ' || ch == ')' || ch == '(') {
                                if (j) {
                                        name[j] = '\0';
@@ -588,7 +586,7 @@ can_test(
 **     cap_index(name-list, index-list)
 **
 **     Scan the name list and return a list of indexes.
-**     <space> ( and ) may be used as seperators.
+**     <space> ( and ) may be used as separators.
 **     This list is terminated with -1.
 */
 void
@@ -597,11 +595,11 @@ cap_index(
        int *inx)
 {
        struct name_table_entry const *nt;
-       int ch, i, j;
+       int ch, j;
        char name[32];
 
        if (s) {
-               for (i = j = 0; ; s++) {
+               for (j = 0; ; s++) {
                        name[j] = ch = *s;
                        if (ch == ' ' || ch == ')' || ch == '(' || ch == 0) {
                                if (j) {
@@ -629,7 +627,7 @@ cap_index(
 **
 **     Scan the name list and see if the cap is in the list.
 **     Return TRUE if we find an exact match.
-**     <space> ( and ) may be used as seperators.
+**     <space> ( and ) may be used as separators.
 */
 int
 cap_match(
@@ -863,7 +861,7 @@ change_one_entry(
                ptextln("That string is not currently defined.  Please enter a new value, including the padding delay:");
                read_string(buf, sizeof(buf));
                _nc_reset_input((FILE *) 0, buf);
-               _nc_trans_string(pad);
+               _nc_trans_string(pad, pad + sizeof(pad));
                t = (char *)malloc(strlen(pad) + 1);
                strcpy(t, pad);
                CUR Strings[x] = t;
@@ -876,7 +874,7 @@ change_one_entry(
        putln(buf);
        ptextln("Enter new pad.  0 for no pad.  CR for no change.");
        read_string(buf, 32);
-       if (buf[0] == '\0' || (buf[1] == '\0' && isalpha(buf[0]))) {
+       if (buf[0] == '\0' || (buf[1] == '\0' && isalpha(UChar(buf[0])))) {
                *chp = buf[0];
                return;
        }