Skip to content

P
proview
Commit 991cb749 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Command line input not converted to upper case

parent 185ac1f1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 779 additions and 767 deletions
src/lib/co/src/co_dcli.c
View file @ 991cb749
......@@ -313,7 +313,7 @@ int dcli_cli( dcli_tCmdTable *command_table,
while ( comtbl_ptr->command[0] != '\0')
{
strcpy( command, comtbl_ptr->command);
if ( strcmp( out_str[0], command) == 0)
if ( cdh_NoCaseStrcmp( out_str[0], command) == 0)
{
/* Perfect hit */
func = comtbl_ptr->func;
......@@ -324,7 +324,7 @@ int dcli_cli( dcli_tCmdTable *command_table,
else
{
command[ strlen( out_str[0])] = '\0';
if ( strcmp( out_str[0], command) == 0)
if ( cdh_NoCaseStrcmp( out_str[0], command) == 0)
{
/* Hit */
func = comtbl_ptr->func;
......@@ -378,7 +378,7 @@ int dcli_cli( dcli_tCmdTable *command_table,
{
strcpy( qual, current_comtbl->qualifier[j]);
qual[ strlen( value_str[0])] = '\0';
if ( strcmp( qual, value_str[0]) == 0)
if ( cdh_NoCaseStrcmp( qual, value_str[0]) == 0)
{
/* Hit */
strcpy( dcli_qual_str[i-1][0], current_comtbl->qualifier[j]);
......@@ -390,7 +390,7 @@ int dcli_cli( dcli_tCmdTable *command_table,
if ( hitnr == 0 || is_arg)
{
/* This might be a argument, look for a argument */
if ( strncmp( current_comtbl->qualifier[arg_count],
if ( cdh_NoCaseStrncmp( current_comtbl->qualifier[arg_count],
"dcli_arg", 7) == 0)
{
sprintf( dcli_qual_str[i-1][0], "dcli_arg%d", arg_count+1);
......@@ -451,7 +451,7 @@ int dcli_get_qualifier( const char *qualifier,
found = 0;
while ( dcli_qual_str[i][0][0] != '\0')
{
if ( strcmp( qualifier, (char *) dcli_qual_str[i]) == 0)
if ( cdh_NoCaseStrcmp( qualifier, (char *) dcli_qual_str[i]) == 0)
{
/* Hit */
if ( value) {
......@@ -614,7 +614,8 @@ int dcli_replace_symbol( char *command, char *newcommand, int newsize)
size = (long int) s - (long int) u;
strncpy( symbol, u, size);
symbol[size] = 0;
cdh_ToUpper( upper_symbol, symbol);
// cdh_ToUpper( upper_symbol, symbol);
strcpy( upper_symbol, symbol);
sts = dcli_get_symbol( upper_symbol, value);
if ( EVEN(sts))
{
......@@ -700,7 +701,7 @@ int dcli_get_symbol( char *key, char *value)
for ( i = 0; i < dcli_symboltable_count; i++)
{
if ( !strcmp( dcli_symboltable[i].key, key))
if ( !cdh_NoCaseStrcmp( dcli_symboltable[i].key, key))
{
strcpy( value, dcli_symboltable[i].value);
return DCLI__SUCCESS;
......@@ -739,13 +740,13 @@ int dcli_get_symbol_cmd( char *key, char *value)
found = 0;
for ( i = 0; i < dcli_symboltable_count; i++)
{
if ( !strcmp( dcli_symboltable[i].key, key))
if ( !cdh_NoCaseStrcmp( dcli_symboltable[i].key, key))
{
/* Perfect match */
strcpy( value, dcli_symboltable[i].value);
return DCLI__SUCCESS;
}
else if ( !strncmp( dcli_symboltable[i].key, key, strlen(key)))
else if ( !cdh_NoCaseStrncmp( dcli_symboltable[i].key, key, strlen(key)))
{
if ( found)
return DCLI__SYMBOL_AMBIG;
......@@ -938,12 +939,12 @@ int dcli_define_symbol( char *key, char *arg1, char *arg2, char *arg3)
return DCLI__SYMVALTOLONG;
}
cdh_ToUpper( value, value);
// cdh_ToUpper( value, value);
/* Look if the symbol exists */
for ( i = 0; i < dcli_symboltable_count; i++)
{
if ( !strcmp( dcli_symboltable[i].key, key))
if ( !cdh_NoCaseStrcmp( dcli_symboltable[i].key, key))
{
strcpy( dcli_symboltable[i].value, value);
return DCLI__SUCCESS;
......@@ -1125,14 +1126,15 @@ int dcli_wildcard( char *wildname,
char upper_name[400];
/* Convert to upper case */
cdh_ToUpper( upper_name, name);
// cdh_ToUpper( upper_name, name);
strcpy( upper_name, name);
t = wildname;
u = upper_name;
s = strchr( t, '*');
if ( s == 0)
{
if (strcmp( t, u) == 0)
if (cdh_NoCaseStrcmp( t, u) == 0)
return 0;
else
return 1;
......@@ -1143,7 +1145,7 @@ int dcli_wildcard( char *wildname,
{
strncpy ( checkstr, t, len);
checkstr[len] = '\0';
if ( strncmp ( checkstr, u, len) != 0)
if ( cdh_NoCaseStrncmp ( checkstr, u, len) != 0)
return 1;
u += len;
}
......@@ -1167,7 +1169,7 @@ int dcli_wildcard( char *wildname,
}
strcpy ( checkstr, t);
u = u + strlen(u) - strlen (checkstr);
if ( strcmp ( checkstr, u ) != 0)
if ( cdh_NoCaseStrcmp ( checkstr, u ) != 0)
return 1;
return 0;
......
src/lib/dtt/src/dtt_rttsys.c
View file @ 991cb749
......@@ -4237,12 +4237,12 @@ int RTTSYS_LOGGING( menu_ctx ctx,
if ( parameter_ptr == (char *) &LOGGING_TYPE)
{
rtt_toupper( LOGGING_TYPE, LOGGING_TYPE);
if (strcmp( LOGGING_TYPE, "EVENT") == 0)
if (cdh_NoCaseStrcmp( LOGGING_TYPE, "EVENT") == 0)
{
strcpy( LOGGING_TYPE, "Event");
rtt_loggtable[logging_page].logg_type = RTT_LOGG_MOD;
}
else if (strcmp( LOGGING_TYPE, "CONT") == 0)
else if (cdh_NoCaseStrcmp( LOGGING_TYPE, "CONT") == 0)
{
strcpy( LOGGING_TYPE, "Cont");
rtt_loggtable[logging_page].logg_type = RTT_LOGG_CONT;
......@@ -5437,115 +5437,115 @@ int rttsys_start_system_picture(
int sts;
/* Start the system picture */
if ( strncmp( picture_name, "SYSTEM", strlen( picture_name)) == 0)
if ( cdh_NoCaseStrncmp( picture_name, "SYSTEM", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "SYSTEM", "SYSTEM",
0, &RTTSYS_SHOW_SYS);
return sts;
}
else if ( strncmp( picture_name, "PLCPGM", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "PLCPGM", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "PLCPGM", "PLCPGM",
0, &RTTSYS_PLCPGM);
return sts;
}
else if ( strncmp( picture_name, "GRAFCET", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "GRAFCET", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "GRAFCET", "GRAFCET",
0, &RTTSYS_GRAFCET);
return sts;
}
else if ( strncmp( picture_name, "DEVICE", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "DEVICE", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "DEVICE", "DEVICE",
0, &RTTSYS_DEVICE);
return sts;
}
else if ( strncmp( picture_name, "PLCTHREAD", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "PLCTHREAD", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "PLCTHREAD", "PLCTHREAD",
0, &RTTSYS_PLCTHREAD);
return sts;
}
else if ( strncmp( picture_name, "PID", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "PID", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "PID", "PID",
0, &RTTSYS_PID);
return sts;
}
else if ( strncmp( picture_name, "LOGGING", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "LOGGING", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "LOGGING", "LOGGING",
0, &RTTSYS_LOGGING);
return sts;
}
else if ( strncmp( picture_name, "NODES", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "NODES", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "NODES", "NODES",
0, &RTTSYS_SHOW_NODES);
return sts;
}
else if ( strncmp( picture_name, "SUBCLI", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "SUBCLI", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "SUBCLI", "SUBCLI",
0, &RTTSYS_SHOW_SUBCLI);
return sts;
}
else if ( strncmp( picture_name, "SUBSRV", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "SUBSRV", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "SUBSRV", "SUBSRV",
0, &RTTSYS_SHOW_SUBSRV);
return sts;
}
else if ( strncmp( picture_name, "NMPSCELL", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "NMPSCELL", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "NMPSCELL", "NMPSCELL",
0, &RTTSYS_NMPSCELL);
return sts;
}
else if ( strncmp( picture_name, "REMNODE", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "REMNODE", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "REMNODE", "REMNODE",
0, &RTTSYS_REMNODE);
return sts;
}
else if ( strncmp( picture_name, "REMTRANS", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "REMTRANS", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "REMTRANS", "REMTRANS",
0, &RTTSYS_REMTRANS);
return sts;
}
else if ( strncmp( picture_name, "RUNNINGTIME", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "RUNNINGTIME", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "RUNNINGTIME", "RUNNINGTIME",
0, &RTTSYS_RUNNINGTIME);
return sts;
}
else if ( strncmp( picture_name, "QAPPLICATIONS", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "QAPPLICATIONS", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "QCOM APPLICATIONS",
"QCOM APPLICATIONS", 0, &RTTSYS_QCOM_APPL);
return sts;
}
else if ( strncmp( picture_name, "QNODES", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "QNODES", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "QCOM NODES",
"QCOM NODES", 0, &RTTSYS_QCOM_NODES);
return sts;
}
else if ( strncmp( picture_name, "POOLS", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "POOLS", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "POOLS",
"POOLS", 0, &RTTSYS_POOLS);
return sts;
}
else if ( strncmp( picture_name, "CACHE", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "CACHE", strlen( picture_name)) == 0)
{
sts = rtt_menu_new_sysedit( ctx, pwr_cNObjid, "CACHE",
"CACHE", 0, &RTTSYS_CACHE);
return sts;
}
else if ( strncmp( picture_name, "ERROR", strlen( picture_name)) == 0)
else if ( cdh_NoCaseStrncmp( picture_name, "ERROR", strlen( picture_name)) == 0)
{
rtt_message('I', "Obsolete command, use \"show device\"");
return RTT__NOPICTURE;
......@@ -10589,7 +10589,7 @@ int RTTSYS_REMTRANS( menu_ctx ctx,
/* Call from system menu, show all objects */
all = 1;
}
else if ( !strcmp( objectname, "REMTRANS"))
else if ( !cdh_NoCaseStrcmp( objectname, "REMTRANS"))
{
/* Call from "show remtrans", show all objects */
all = 1;
......
src/lib/rt/src/rt_rtt_command.c
View file @ 991cb749
This diff is collapsed.
src/lib/rt/src/rt_rtt_edit.c
View file @ 991cb749
This diff is collapsed.
src/lib/rt/src/rt_rtt_menu.c
View file @ 991cb749
......@@ -747,7 +747,7 @@ int rtt_cli( rtt_t_comtbl *command_table,
while ( comtbl_ptr->command[0] != '\0')
{
strcpy( command, comtbl_ptr->command);
if ( strcmp( out_str[0], command) == 0)
if ( cdh_NoCaseStrcmp( out_str[0], command) == 0)
{
/* Perfect hit */
func = comtbl_ptr->func;
......@@ -758,7 +758,7 @@ int rtt_cli( rtt_t_comtbl *command_table,
else
{
command[ strlen( out_str[0])] = '\0';
if ( strcmp( out_str[0], command) == 0)
if ( cdh_NoCaseStrcmp( out_str[0], command) == 0)
{
/* Hit */
func = comtbl_ptr->func;
......@@ -812,7 +812,7 @@ int rtt_cli( rtt_t_comtbl *command_table,
{
strcpy( qual, current_comtbl->qualifier[j]);
qual[ strlen( value_str[0])] = '\0';
if ( strcmp( qual, value_str[0]) == 0)
if ( cdh_NoCaseStrcmp( qual, value_str[0]) == 0)
{
/* Hit */
strcpy( rtt_qual_str[i-1][0], current_comtbl->qualifier[j]);
......@@ -884,7 +884,7 @@ int rtt_get_qualifier( char *qualifier,
found = 0;
while ( rtt_qual_str[i][0][0] != '\0')
{
if ( strcmp( qualifier, (char *) rtt_qual_str[i]) == 0)
if ( cdh_NoCaseStrcmp( qualifier, (char *) rtt_qual_str[i]) == 0)
{
/* Hit */
strcpy( value, (char *) &rtt_qual_str[i][1]);
......@@ -7664,7 +7664,7 @@ static int rtt_set_value(
}
else
*/
if ( strncmp( menu_ptr->parameter_name, "_A_ ", 4) == 0)
if ( cdh_NoCaseStrncmp( menu_ptr->parameter_name, "_A_ ", 4) == 0)
{
/* Parameter is given as an attref */
sscanf( &menu_ptr->parameter_name[4], "%d %d %d %d",
......@@ -7862,13 +7862,13 @@ int rtt_help(
int sts;
char title[100];
if ( *subject == '\0' || strncmp( subject, "HELP", strlen(subject)) == 0)
if ( *subject == '\0' || cdh_NoCaseStrncmp( subject, "HELP", strlen(subject)) == 0)
{
/* No subject is given take help as default */
sts = rtt_help_show_all( parent_ctx, helptext);
return sts;
}
else if ( *subject == '\0' || strncmp( subject, "SCRIPT", strlen(subject)) == 0)
else if ( *subject == '\0' || cdh_NoCaseStrncmp( subject, "SCRIPT", strlen(subject)) == 0)
{
/* No subject is given take help as default */
sts = rtt_help_show_all( parent_ctx, rtt_script_helptext);
......@@ -7899,7 +7899,7 @@ int rtt_help(
for ( i = 0; i < subjectnr; i++)
{
rtt_toupper( ht_subj_array[i], ht_subj_array[i]);
if ( strncmp( subj_array[i], ht_subj_array[i],
if ( cdh_NoCaseStrncmp( subj_array[i], ht_subj_array[i],
strlen( subj_array[i])) != 0)
{
no_match = 1;
......@@ -7998,7 +7998,7 @@ static int rtt_help_getinfoline(
for ( i = 0; i < subjectnr; i++)
{
rtt_toupper( ht_subj_array[i], ht_subj_array[i]);
if ( strncmp( subj_array[i], ht_subj_array[i],
if ( cdh_NoCaseStrncmp( subj_array[i], ht_subj_array[i],
strlen( subj_array[i])) != 0)
{
no_match = 1;
......@@ -10154,8 +10154,8 @@ int rtt_get_fastkey_type( )
if ( (fastkey_menu_ptr + key)->func == &rtt_menu_command)
{
strcpy( command, (char *)((fastkey_menu_ptr + key)->arg1));
rtt_toupper( command, command);
if ( !strncmp( command, "SET", 3))
// rtt_toupper( command, command);
if ( !cdh_NoCaseStrncmp( command, "SET", 3))
return RTT__NOPICTURE;
}
else if ( (fastkey_menu_ptr + key)->func == &rtt_menu_commandhold)
......
wb/lib/wb/src/wb_wnav_command.cpp
View file @ 991cb749
This diff is collapsed.
xtt/lib/ge/src/ge_graph_command.cpp
View file @ 991cb749
This diff is collapsed.
xtt/lib/xtt/src/xtt_xnav_command.cpp
View file @ 991cb749
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7