diff --git a/src/apps/terminal/MYOB/TermApp.cpp b/src/apps/terminal/MYOB/TermApp.cpp index c1c075785f..91fccdc53f 100644 --- a/src/apps/terminal/MYOB/TermApp.cpp +++ b/src/apps/terminal/MYOB/TermApp.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include #include @@ -624,7 +623,7 @@ argmatch (char **argv, int argc, char *sstr, char *lstr, *skipptr += 1; return 1; } - arglen = (valptr != NULL && (p = index (arg, '=')) != NULL + arglen = (valptr != NULL && (p = strchr(arg, '=')) != NULL ? p - arg : strlen (arg)); if (lstr == 0 || arglen < minlen || strncmp (arg, lstr, arglen) != 0) return 0; @@ -715,8 +714,8 @@ sort_args (int argc, char **argv) if (argv[from][1] == '-') { match = -1; - thislen = strlen (argv[from]); - equals = index (argv[from], '='); + thislen = strlen(argv[from]); + equals = strchr(argv[from], '='); if (equals != 0) thislen = equals - argv[from]; @@ -797,9 +796,9 @@ sort_args (int argc, char **argv) while (to < argc) newargv[to++] = 0; - bcopy (newargv, argv, sizeof (char *) * argc); + memcpy(argv, newargv, sizeof (char *) * argc); - free (options); - free (newargv); - free (priority); + free(options); + free(newargv); + free(priority); }