diff -Naur maui-3.2.6p19/configure maui-3.2.6p19-new/configure --- maui-3.2.6p19/configure 2006-12-01 15:10:06.000000000 +0000 +++ maui-3.2.6p19-new/configure 2007-01-25 20:44:44.000000000 +0000 @@ -2730,7 +2730,7 @@ fi; if test "$PCREDIR" != 'FALSE'; then if test "$PCREDIR" = 'yes'; then - PCREDIR='/path/to/pcre'; + PCREDIR='/usr'; fi diff -Naur maui-3.2.6p19/etc/maui.d maui-3.2.6p19-new/etc/maui.d --- maui-3.2.6p19/etc/maui.d 2006-12-01 15:08:05.000000000 +0000 +++ maui-3.2.6p19-new/etc/maui.d 2007-01-25 20:29:47.000000000 +0000 @@ -9,7 +9,7 @@ # Source the library functions . /etc/rc.d/init.d/functions -MAUI_PREFIX=/opt/maui +MAUI_PREFIX=@prefix@ # let see how we were called case "$1" in diff -Naur maui-3.2.6p19/include/Makefile.inc.pcre.in maui-3.2.6p19-new/include/Makefile.inc.pcre.in --- maui-3.2.6p19/include/Makefile.inc.pcre.in 2006-12-01 15:10:06.000000000 +0000 +++ maui-3.2.6p19-new/include/Makefile.inc.pcre.in 2006-12-01 18:30:18.000000000 +0000 @@ -1,6 +1,6 @@ # PCRE Definitions -export REGEXLIB = "-lpcreposix -lpcre" -export REGEXIP = "-I@PCREDIR@/include" -export REGEXLP = "-L@PCREDIR@/lib" -export REGEXDEF = "-DPCRE" +export REGEXLIB = -lpcreposix -lpcre +export REGEXIP = -I@PCREDIR@/include +export REGEXLP = -L@PCREDIR@/lib +export REGEXDEF = -DPCRE diff -Naur maui-3.2.6p19/src/mcom/MComm.c maui-3.2.6p19-new/src/mcom/MComm.c --- maui-3.2.6p19/src/mcom/MComm.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/mcom/MComm.c 2007-01-25 18:43:15.000000000 +0000 @@ -318,7 +318,7 @@ mcsaDES, Cred->EncryptionData.CSKey); - if (strcmp(cksum,CKSum) != 0) + if (strcasecmp(cksum,CKSum) != 0) { MDB(1,fSOCK) MLog("ALERT: checksum does not match (%s:%s)\n", cksum, diff -Naur maui-3.2.6p19/src/mcom/MS3I.c maui-3.2.6p19-new/src/mcom/MS3I.c --- maui-3.2.6p19/src/mcom/MS3I.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/mcom/MS3I.c 2007-01-25 18:43:15.000000000 +0000 @@ -2360,7 +2360,7 @@ if (MXMLGetChildCI(StepE,MS3JobAttr[R->Version][mjaAWDuration],NULL,&C2) == SUCCESS) { - if (!strcmp(C2->Val,"0")) + if (!strcasecmp(C2->Val,"0")) *Status = mjsIdle; else *Status = mjsRunning; @@ -3261,7 +3261,7 @@ if ((C == NULL) || (C->Name[0] == '\0')) break; - if (!strcmp(C->Name,"DEFAULT") || !strcmp(C->Name,"ALL")) + if (!strcasecmp(C->Name,"DEFAULT") || !strcasecmp(C->Name,"ALL")) continue; if (C->NodeList != NULL) @@ -4045,9 +4045,9 @@ case mnaNodeState: - if (!strcmp(R->APIVersion,MS3VName[msssV3_0]) || - !strcmp(R->APIVersion,MS3VName[msssV4_0]) || - !strcmp(R->APIVersion,MS3VName[msssV0_2])) + if (!strcasecmp(R->APIVersion,MS3VName[msssV3_0]) || + !strcasecmp(R->APIVersion,MS3VName[msssV4_0]) || + !strcasecmp(R->APIVersion,MS3VName[msssV0_2])) { const char *S3NState[] = { NONE, "up", "down", NULL }; const int S3NSEq[] = { mnsNone, mnsUnknown, mnsDown, -1 }; @@ -4109,7 +4109,7 @@ AE = (mxml_t *)AData; - if (strcmp(AName,"Available")) + if (strcasecmp(AName,"Available")) { IsConfigured = TRUE; } @@ -4263,7 +4263,7 @@ case mclaState: - if (!strcmp(AVal,"true")) + if (!strcasecmp(AVal,"true")) { C->State = mclsActive; @@ -4581,19 +4581,19 @@ AE = (mxml_t *)E; - if (!strcmp(AName,"Requested")) + if (!strcasecmp(AName,"Requested")) { IsUtilized = FALSE; } - else if (!strcmp(AName,"Delivered")) + else if (!strcasecmp(AName,"Delivered")) { IsUtilized = TRUE; } - else if (!strcmp(AName,"NodeProperties")) + else if (!strcasecmp(AName,"NodeProperties")) { IsConsumable = FALSE; } - else if (!strcmp(AName,"TaskGroup")) + else if (!strcasecmp(AName,"TaskGroup")) { /* NO-OP */ } @@ -5571,7 +5571,7 @@ return(FAILURE); } - if (strcmp(CE->Val,"true")) + if (strcasecmp(CE->Val,"true")) { mxml_t *tE = NULL; @@ -5616,7 +5616,7 @@ R->FailIteration = MSched.Iteration; return(FAILURE); - } /* END if (strcmp(C->Val,"true")) */ + } /* END if (strcasecmp(C->Val,"true")) */ /* job successfully started */ @@ -6045,7 +6045,7 @@ tptr++; - if (strncmp(tptr,"ppn=",strlen("ppn=")) == 0) + if (strncasecmp(tptr,"ppn=",strlen("ppn=")) == 0) { tptr += strlen("ppn="); @@ -6195,7 +6195,7 @@ return(SUCCESS); } - if (!strcmp(Version,"S32.0")) + if (!strcasecmp(Version,"S32.0")) { /* NYI */ } @@ -6235,7 +6235,7 @@ return(SUCCESS); } - if (!strcmp(Version,"S32.0")) + if (!strcasecmp(Version,"S32.0")) { /* FORMAT: */ @@ -7024,7 +7024,7 @@ continue; } - if (!strcmp(JID,JL[jindex])) + if (!strcasecmp(JID,JL[jindex])) { return(SUCCESS); } @@ -7075,7 +7075,7 @@ continue; } - if (!strcmp(JID,JL[jindex])) + if (!strcasecmp(JID,JL[jindex])) { MUFree(&JL[jindex]); @@ -7196,7 +7196,7 @@ return(FAILURE); } - if ((CE->Val == NULL) || !strcmp(CE->Val,"Failure")) + if ((CE->Val == NULL) || !strcasecmp(CE->Val,"Failure")) { /* command failed */ @@ -7237,7 +7237,7 @@ } } - if ((CE->Val == NULL) || strcmp(CE->Val,"true")) + if ((CE->Val == NULL) || strcasecmp(CE->Val,"true")) { /* command failed */ diff -Naur maui-3.2.6p19/src/mcom/MSU.c maui-3.2.6p19-new/src/mcom/MSU.c --- maui-3.2.6p19/src/mcom/MSU.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/mcom/MSU.c 2007-01-25 18:43:15.000000000 +0000 @@ -2150,7 +2150,7 @@ return(FAILURE); } - if (!strncmp(tmpLine,"GET ",strlen("GET "))) + if (!strncasecmp(tmpLine,"GET ",strlen("GET "))) { IsRequest = TRUE; @@ -2193,7 +2193,7 @@ strcpy(EMsg,"socket is closed"); return(FAILURE); - } /* END if (!strncmp(tmpLine,"GET ",strlen("GET "))) */ + } /* END if (!strncasecmp(tmpLine,"GET ",strlen("GET "))) */ tmpLine[8] = '\0'; @@ -2396,7 +2396,7 @@ if (C->Name[0] == '\1') continue; - if (!strcmp(S->Name,C->Name)) + if (!strcasecmp(S->Name,C->Name)) { strcpy(S->CSKey,C->CSKey); @@ -2491,7 +2491,7 @@ S->CSAlgo, S->CSKey); - if (strcmp(CKSum,CKLine) != 0) + if (strcasecmp(CKSum,CKLine) != 0) { MDB(1,fSOCK) MLog("ALERT: checksum does not match (%s:%s) request '%.120s'\n", CKSum, @@ -2499,9 +2499,9 @@ ptr); #ifdef __M32COMPAT - if (strcmp(MSched.Admin4User[0],"ALL")) + if (strcasecmp(MSched.Admin4User[0],"ALL")) #else /* __M32COMPAT */ - if (strcmp(MSched.Admin[4].UName[0],"ALL")) + if (strcasecmp(MSched.Admin[4].UName[0],"ALL")) #endif /* __M32COMPAT */ { MUFree(&S->RBuffer); @@ -2514,7 +2514,7 @@ return(FAILURE); } - } /* END if (strcmp(CKSum,CKLine) != 0) */ + } /* END if (strcasecmp(CKSum,CKLine) != 0) */ } /* END if (S->CSKey != NULL) */ /* get timestamp */ @@ -2719,7 +2719,7 @@ return(FAILURE); } - if (strcmp(SVE->Val,tmpLine)) + if (strcasecmp(SVE->Val,tmpLine)) { /* signatures do not match */ @@ -2783,7 +2783,7 @@ *SC = mscNoAuth; return(FAILURE); - } /* if (strcmp(SVE->Val,tmpLine)) */ + } /* if (strcasecmp(SVE->Val,tmpLine)) */ } /* END if (MXMLGetChild(EE,"Signature",NULL,&SE) == SUCCESS) */ else { @@ -3785,7 +3785,7 @@ for (index = 0;index < MMAX_CLIENT;index++) { - if (!strcmp(MClient[index].Name,ClientName)) + if (!strcasecmp(MClient[index].Name,ClientName)) { strcpy(S->CSKey,MClient[index].CSKey); diff -Naur maui-3.2.6p19/src/mcom/MXML.c maui-3.2.6p19-new/src/mcom/MXML.c --- maui-3.2.6p19/src/mcom/MXML.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/mcom/MXML.c 2007-01-25 18:43:15.000000000 +0000 @@ -466,7 +466,7 @@ for (aindex = 0;aindex < E->ACount;aindex++) { - rc = strcmp(E->AName[aindex],A); + rc = strcasecmp(E->AName[aindex],A); if (rc > 0) break; @@ -1073,7 +1073,7 @@ if ((NoCompress == FALSE) && (strlen(Buf) > (MMAX_BUFFER >> 1))) { - if ((E->Name != NULL) && !strcmp(E->Name,"Data")) + if ((E->Name != NULL) && !strcasecmp(E->Name,"Data")) { /* attempt to compress in place */ @@ -1234,7 +1234,7 @@ { if ((AName == NULL) || (AName[0] == '\0') || - !strcmp(AName,E->AName[aindex])) + !strcasecmp(AName,E->AName[aindex])) { if ((AName != NULL) && (AName[0] == '\0')) { @@ -1290,7 +1290,7 @@ if (E->C[cindex] == NULL) continue; - if ((CName == NULL) || !strcmp(CName,E->C[cindex]->Name)) + if ((CName == NULL) || !strcasecmp(CName,E->C[cindex]->Name)) { *C = E->C[cindex]; @@ -1454,7 +1454,7 @@ /* ignore 'comment' element */ - if (!strncmp(ptr,"!--",3)) + if (!strncasecmp(ptr,"!--",3)) { ptr += 3; @@ -1477,7 +1477,7 @@ return(FAILURE); } - } /* END if (!strncmp(ptr,"!--",3)) */ + } /* END if (!strncasecmp(ptr,"!--",3)) */ else if (ptr[1] == '!') { char* ptr2; @@ -1721,7 +1721,7 @@ index = 0; - if (!strncmp(ptr,CRYPTHEAD,strlen(CRYPTHEAD))) + if (!strncasecmp(ptr,CRYPTHEAD,strlen(CRYPTHEAD))) { char *tail; int len; @@ -1767,7 +1767,7 @@ /* move pointer to end of compressed data */ ptr = tail; - } /* END if (!strncmp(ptr,CRYPTHEAD,strlen(CRYPTHEAD))) */ + } /* END if (!strncasecmp(ptr,CRYPTHEAD,strlen(CRYPTHEAD))) */ while (*ptr != '<') { @@ -1869,7 +1869,7 @@ if (E->Val == NULL) { - if (!strncmp(ptr,CRYPTHEAD,strlen(CRYPTHEAD))) + if (!strncasecmp(ptr,CRYPTHEAD,strlen(CRYPTHEAD))) { char *tail; int len; @@ -1915,7 +1915,7 @@ /* move pointer to end of compressed data */ ptr = tail; - } /* END if (!strncmp(ptr,CRYPTHEAD,strlen(CRYPTHEAD))) */ + } /* END if (!strncasecmp(ptr,CRYPTHEAD,strlen(CRYPTHEAD))) */ index = 0; diff -Naur maui-3.2.6p19/src/moab/MACL.c maui-3.2.6p19-new/src/moab/MACL.c --- maui-3.2.6p19/src/moab/MACL.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MACL.c 2007-01-25 18:01:28.000000000 +0000 @@ -191,7 +191,7 @@ } else { - if (!strncmp(tmpLine,"==",2)) + if (!strncasecmp(tmpLine,"==",2)) strcat(Buffer,&tmpLine[2]); else strcat(Buffer,tmpLine); @@ -763,8 +763,8 @@ { ValMatch = FALSE; } - else if ((strcmp(CL[cindex].Name,ACL[aindex].Name)) && - (strcmp(CL[cindex].Name,ALL))) + else if ((strcasecmp(CL[cindex].Name,ACL[aindex].Name)) && + (strcasecmp(CL[cindex].Name,ALL))) { ValMatch = FALSE; } diff -Naur maui-3.2.6p19/src/moab/MAM.c maui-3.2.6p19-new/src/moab/MAM.c --- maui-3.2.6p19/src/moab/MAM.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MAM.c 2007-01-25 18:01:28.000000000 +0000 @@ -418,7 +418,7 @@ R = (J->RM != NULL) ? J->RM : &MRM[0]; - if (((J->Cred.A == NULL) || (!strcmp(J->Cred.A->Name,NONE))) && + if (((J->Cred.A == NULL) || (!strcasecmp(J->Cred.A->Name,NONE))) && (MSched.DefaultAccountName[0] == '\0') && (A->Type != mamtQBANK) && (A->Type != mamtGOLD) && @@ -430,7 +430,7 @@ return(FAILURE); } - if ((J->Cred.A != NULL) && strcmp(J->Cred.A->Name,NONE)) + if ((J->Cred.A != NULL) && strcasecmp(J->Cred.A->Name,NONE)) { strcpy(AccountName,J->Cred.A->Name); @@ -526,7 +526,7 @@ /* determine QOS */ - if ((J->Cred.Q != NULL) && strcmp(J->Cred.Q->Name,DEFAULT)) + if ((J->Cred.Q != NULL) && strcasecmp(J->Cred.Q->Name,DEFAULT)) { sprintf(QOSString,"QOS=%s ", J->Cred.Q->Name); @@ -819,7 +819,7 @@ /* NOTE: no default accounts for reservations */ - if ((R->A == NULL) || !strcmp(R->A->Name,NONE)) + if ((R->A == NULL) || !strcasecmp(R->A->Name,NONE)) { MDB(2,fAM) MLog("ALERT: no account specified for res %s\n", R->Name); @@ -1154,7 +1154,7 @@ return(FAILURE); } - if (((J->Cred.A == NULL) || (!strcmp(J->Cred.A->Name,NONE))) && + if (((J->Cred.A == NULL) || (!strcasecmp(J->Cred.A->Name,NONE))) && (AM->Type != mamtQBANK) && (AM->Type != mamtGOLD) && (AM->Type != mamtFILE)) @@ -1170,7 +1170,7 @@ RM = (J->RM != NULL) ? J->RM : &MRM[0]; - if ((J->Cred.A != NULL) && strcmp(J->Cred.A->Name,NONE)) + if ((J->Cred.A != NULL) && strcasecmp(J->Cred.A->Name,NONE)) { strcpy(AccountName,J->Cred.A->Name); @@ -1219,7 +1219,7 @@ /* determine QOS */ - if ((J->Cred.Q != NULL) && strcmp(J->Cred.Q->Name,DEFAULT)) + if ((J->Cred.Q != NULL) && strcasecmp(J->Cred.Q->Name,DEFAULT)) { sprintf(QOSString,"QOS=%s ", J->Cred.Q->Name); @@ -1673,7 +1673,7 @@ { A = &MAM[amindex]; - if ((A != NULL) && !strcmp(A->Name,AMName)) + if ((A != NULL) && !strcasecmp(A->Name,AMName)) { /* AM already exists */ @@ -1799,7 +1799,7 @@ break; } - if (strcmp(A->Name,AMName) != 0) + if (strcasecmp(A->Name,AMName) != 0) continue; /* AM found */ @@ -2058,7 +2058,7 @@ char tmpHost[MMAX_LINE]; char tmpProtocol[MMAX_LINE]; - if (!strcmp(ValLine,"ANY")) + if (!strcasecmp(ValLine,"ANY")) { A->UseDirectoryService = TRUE; @@ -2766,11 +2766,11 @@ if ((NE->Val == NULL) || (NE->Val[0] == '\0')) continue; - if (!strcmp(NE->Val,"$ANY") || - !strcmp(NE->Val,"$NONE"), - !strcmp(NE->Val,"$MEMBER"), - !strcmp(NE->Val,"$DEFINED"), - !strcmp(NE->Val,"$SPECIFIED")) + if (!strcasecmp(NE->Val,"$ANY") || + !strcasecmp(NE->Val,"$NONE"), + !strcasecmp(NE->Val,"$MEMBER"), + !strcasecmp(NE->Val,"$DEFINED"), + !strcasecmp(NE->Val,"$SPECIFIED")) { continue; } @@ -2824,7 +2824,7 @@ if (DACache[uindex].UName[0] == '\0') break; - if (strcmp(DACache[uindex].UName,UName)) + if (strcasecmp(DACache[uindex].UName,UName)) continue; /* match located */ @@ -3671,7 +3671,7 @@ return(FAILURE); } - if ((Response[0] == '\0') || !strcmp(Response,"1")) + if ((Response[0] == '\0') || !strcasecmp(Response,"1")) { MDB(1,fAM) MLog("INFO: AM is synchronized\n"); @@ -3768,7 +3768,7 @@ return(SUCCESS); } - if ((CAName[0] == '\0') || !strcmp(CAName,NONE)) + if ((CAName[0] == '\0') || !strcasecmp(CAName,NONE)) { MDB(2,fAM) MLog("ALERT: no account specified for request %s\n", ReqID); @@ -3956,7 +3956,7 @@ return(SUCCESS); } - if ((CAName == NULL) || !strcmp(CAName,NONE)) + if ((CAName == NULL) || !strcasecmp(CAName,NONE)) { MDB(2,fAM) MLog("ALERT: no account specified for reservation %s\n", ResName); diff -Naur maui-3.2.6p19/src/moab/MAcct.c maui-3.2.6p19-new/src/moab/MAcct.c --- maui-3.2.6p19/src/moab/MAcct.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MAcct.c 2007-01-25 18:01:28.000000000 +0000 @@ -234,7 +234,7 @@ /* if account already in table */ - if (!strcmp(Atmp->Name,AName)) + if (!strcasecmp(Atmp->Name,AName)) { if (A != NULL) *A = Atmp; @@ -251,7 +251,7 @@ if (A != NULL) *A = Atmp; - if (!strcmp(AName,NONE)) + if (!strcasecmp(AName,NONE)) Atmp->Key = 0; else Atmp->Key = Key; @@ -260,7 +260,7 @@ Atmp->Index = aindex; - if (strcmp(AName,ALL) && strcmp(AName,NONE)) + if (strcasecmp(AName,ALL) && strcasecmp(AName,NONE)) { /* update account record */ @@ -329,7 +329,7 @@ break; } - if (strcmp(MAcct[aindex].Name,AName) != 0) + if (strcasecmp(MAcct[aindex].Name,AName) != 0) continue; /* Account found */ diff -Naur maui-3.2.6p19/src/moab/MAppSim.c maui-3.2.6p19-new/src/moab/MAppSim.c --- maui-3.2.6p19/src/moab/MAppSim.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MAppSim.c 2007-01-25 18:01:28.000000000 +0000 @@ -204,7 +204,7 @@ if ((ResName != NULL) && (ResName[0] == '\0') && - !strcmp(R->Name,ResName)) + !strcasecmp(R->Name,ResName)) { continue; } @@ -268,7 +268,7 @@ continue; } - if (!strcmp(DName,SimDriver[findex].Name)) + if (!strcasecmp(DName,SimDriver[findex].Name)) { /* match found */ diff -Naur maui-3.2.6p19/src/moab/MBF.c maui-3.2.6p19-new/src/moab/MBF.c --- maui-3.2.6p19/src/moab/MBF.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MBF.c 2007-01-25 18:01:28.000000000 +0000 @@ -845,15 +845,15 @@ MJobGetAccount(J,&tmpADef); if ((AName == NULL) || - !strncmp(AName,"ALL",3) || - !strncmp(AName,NONE,strlen(NONE))) + !strncasecmp(AName,"ALL",3) || + !strncasecmp(AName,NONE,strlen(NONE))) { J->Cred.A = tmpADef; } MQOSGetAccess(J,NULL,tmpQAL,&tmpQDef); - if ((QOSName == NULL) || !strncmp(QOSName,NONE,strlen(NONE))) + if ((QOSName == NULL) || !strncasecmp(QOSName,NONE,strlen(NONE))) { J->QReq = tmpQDef; } @@ -873,7 +873,7 @@ MJobBuildCL(J); - if ((FeatureString == NULL) || !strcmp(FeatureString,NONE)) + if ((FeatureString == NULL) || !strcasecmp(FeatureString,NONE)) { memset(RQ->ReqFBM,0,sizeof(RQ->ReqFBM)); } diff -Naur maui-3.2.6p19/src/moab/MCP.c maui-3.2.6p19-new/src/moab/MCP.c --- maui-3.2.6p19/src/moab/MCP.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MCP.c 2007-01-25 18:01:28.000000000 +0000 @@ -549,7 +549,7 @@ for (ckindex = 0;MCPType[ckindex] != NULL;ckindex++) { - if (strncmp(ptr,MCPType[ckindex],strlen(MCPType[ckindex]))) + if (strncasecmp(ptr,MCPType[ckindex],strlen(MCPType[ckindex]))) continue; if ((Mode == mckptResOnly) && @@ -1220,7 +1220,7 @@ head = Buffer + buflen; } - if (!strncmp(ptr,MCPType[mcpJob],strlen(MCPType[mcpJob]))) + if (!strncasecmp(ptr,MCPType[mcpJob],strlen(MCPType[mcpJob]))) { /* determine job completion time estimate */ @@ -1246,7 +1246,7 @@ MJobWriteStats(&tmpJ); } } - } /* END if (!strcmp(ptr,MCPType[])) */ + } /* END if (!strcasecmp(ptr,MCPType[])) */ } /* END while (ptr != NULL) */ return(SUCCESS); @@ -1521,7 +1521,7 @@ MSRFromString(SR,ptr); - if (strcmp(tmpAName,NONE)) + if (strcasecmp(tmpAName,NONE)) { MAcctFind(tmpAName,&SR->A); } @@ -1541,7 +1541,7 @@ continue; } - if (!strcmp(SR->Name,tmpSR.Name)) + if (!strcasecmp(SR->Name,tmpSR.Name)) break; } diff -Naur maui-3.2.6p19/src/moab/MClass.c maui-3.2.6p19-new/src/moab/MClass.c --- maui-3.2.6p19/src/moab/MClass.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MClass.c 2007-01-25 18:01:28.000000000 +0000 @@ -158,7 +158,7 @@ for (cindex = 1;MClass[cindex].Name[0] != '\0';cindex++) { - if (!strcmp(MClass[cindex].Name,CName)) + if (!strcasecmp(MClass[cindex].Name,CName)) { *C = &MClass[cindex]; @@ -240,7 +240,7 @@ return(SUCCESS); } - if (!strcmp(MClass[cindex].Name,CName)) + if (!strcasecmp(MClass[cindex].Name,CName)) { if (C != NULL) *C = &MClass[cindex]; @@ -360,10 +360,10 @@ if (C->Name[0] == '\0') continue; - if (!strcmp(C->Name,NONE) || !strcmp(C->Name,ALL)) + if (!strcasecmp(C->Name,NONE) || !strcasecmp(C->Name,ALL)) continue; - if ((CP != NULL) && (strcmp(CP->Name,NONE) != 0) && (C != CP)) + if ((CP != NULL) && (strcasecmp(CP->Name,NONE) != 0) && (C != CP)) continue; tmpLine[0] = '\0'; @@ -425,7 +425,7 @@ { if ((MClassAToString(C,ClAList[aindex],tmpLString,mdfString,0) == SUCCESS) && (tmpLString[0] != '\0') && - strcmp(tmpLString,NONE)) + strcasecmp(tmpLString,NONE)) { sprintf(&tmpLine[strlen(tmpLine)]," %s=%s", MClassAttr[ClAList[aindex]], diff -Naur maui-3.2.6p19/src/moab/MConfig.c maui-3.2.6p19-new/src/moab/MConfig.c --- maui-3.2.6p19/src/moab/MConfig.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MConfig.c 2007-01-25 18:01:28.000000000 +0000 @@ -177,7 +177,7 @@ { /* look for include */ - if (!strncmp(ptr,"#INCLUDE",strlen("#INCLUDE"))) + if (!strncasecmp(ptr,"#INCLUDE",strlen("#INCLUDE"))) { int rc; @@ -373,7 +373,7 @@ while (isspace(*ptr)) ptr++; - if (strncmp(IName,ptr,strlen(IName)) != 0) + if (strncasecmp(IName,ptr,strlen(IName)) != 0) continue; ptr += strlen(IName); @@ -435,7 +435,7 @@ for (iindex = 0;SymTable[iindex] != NULL;iindex++) { - if (!strcmp(SymTable[iindex],IndexName)) + if (!strcasecmp(SymTable[iindex],IndexName)) { *Index = iindex; break; diff -Naur maui-3.2.6p19/src/moab/MCred.c maui-3.2.6p19-new/src/moab/MCred.c --- maui-3.2.6p19/src/moab/MCred.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MCred.c 2007-01-25 18:01:28.000000000 +0000 @@ -3691,8 +3691,8 @@ { /* FORMAT: INDEXNAME: || RM: */ - if (!strncmp("RM:",IndexName,strlen("RM:")) || - !strncmp("AM:",IndexName,strlen("AM:"))) + if (!strncasecmp("RM:",IndexName,strlen("RM:")) || + !strncasecmp("AM:",IndexName,strlen("AM:"))) { if (OName == NULL) { diff -Naur maui-3.2.6p19/src/moab/MFS.c maui-3.2.6p19-new/src/moab/MFS.c --- maui-3.2.6p19/src/moab/MFS.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MFS.c 2007-01-25 18:01:28.000000000 +0000 @@ -691,7 +691,7 @@ continue; } - if (!strcmp(Type,"TOTAL")) + if (!strcasecmp(Type,"TOTAL")) { oindex = mxoSched; } @@ -1326,7 +1326,7 @@ if ((NameP == NULL) || (NameP[0] == '\0') || - !strcmp(NameP,ALL)) + !strcasecmp(NameP,ALL)) { /* invalid name specified */ diff -Naur maui-3.2.6p19/src/moab/MFile.c maui-3.2.6p19-new/src/moab/MFile.c --- maui-3.2.6p19/src/moab/MFile.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MFile.c 2007-01-25 18:01:28.000000000 +0000 @@ -416,7 +416,7 @@ if (MFileCache[index].FileName[0] == '\0') continue; - if (strcmp(MFileCache[index].FileName,FileName)) + if (strcasecmp(MFileCache[index].FileName,FileName)) continue; /* cache entry located */ @@ -504,7 +504,7 @@ if (MFileCache[index].FileName[0] == '\0') continue; - if (strcmp(MFileCache[index].FileName,FileName)) + if (strcasecmp(MFileCache[index].FileName,FileName)) continue; if (MFileCache[index].Buffer != NULL) @@ -719,7 +719,7 @@ for (index = 0;index < MAX_FILECACHE;index++) { - if (!strcmp(MIndexState[index].FileName,FileName)) + if (!strcasecmp(MIndexState[index].FileName,FileName)) { MIndexState[index].Index = RecordCount; @@ -858,7 +858,7 @@ { rcount++; } - else if (!strcmp(Index[index].Key,Key)) + else if (!strcasecmp(Index[index].Key,Key)) { if ((*Buffer = (char *)malloc(RecSize)) == NULL) { @@ -1003,7 +1003,7 @@ if ((Index[index].Key[0] == '\0') && (bestindex == -1)) bestindex = index; - if (!strcmp(Index[index].Key,Key)) + if (!strcasecmp(Index[index].Key,Key)) { bestindex = index; @@ -1182,7 +1182,7 @@ for (index = 1;index < count;index++) { - if (!strcmp(Key,Index[index].Key)) + if (!strcasecmp(Key,Index[index].Key)) break; } @@ -1415,7 +1415,7 @@ if (MFileCache[index].FileName[0] == '\0') continue; - if (strcmp(MFileCache[index].FileName,FileName)) + if (strcasecmp(MFileCache[index].FileName,FileName)) continue; /* located cache entry */ @@ -1445,7 +1445,7 @@ for (index = 0;index < MAX_FILECACHE;index++) { - if (!strcmp(FileName,MIndexState[index].FileName)) + if (!strcasecmp(FileName,MIndexState[index].FileName)) { if (Mode == 1) MIndexState[index].Index++; diff -Naur maui-3.2.6p19/src/moab/MGUtil.c maui-3.2.6p19-new/src/moab/MGUtil.c --- maui-3.2.6p19/src/moab/MGUtil.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MGUtil.c 2007-01-25 18:01:28.000000000 +0000 @@ -631,12 +631,12 @@ for (index = 0;ValList[index] != NULL;index++) { if ((AllowSubstring == FALSE) && - (!strcmp(Value,ValList[index]))) + (!strcasecmp(Value,ValList[index]))) { return(index); } else if ((AllowSubstring == TRUE) && - (!strncmp(Value,ValList[index],strlen(ValList[index])))) + (!strncasecmp(Value,ValList[index],strlen(ValList[index])))) { return(index); } @@ -644,7 +644,7 @@ { int len = strlen(ValList[index]); - if (!strncmp(Value,ValList[index],len) && + if (!strncasecmp(Value,ValList[index],len) && (strchr(" \t\n=<>,:;|",Value[len]) || (Value[len] == '\0'))) { return(index); diff -Naur maui-3.2.6p19/src/moab/MGroup.c maui-3.2.6p19-new/src/moab/MGroup.c --- maui-3.2.6p19/src/moab/MGroup.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MGroup.c 2007-01-25 18:01:28.000000000 +0000 @@ -243,7 +243,7 @@ if (hashkey == Gtmp->Key) { - if (!strcmp(Gtmp->Name,GName)) + if (!strcasecmp(Gtmp->Name,GName)) { if (GP != NULL) *GP = Gtmp; @@ -267,7 +267,7 @@ MUStrCpy(Gtmp->Name,GName,sizeof(Gtmp->Name)); - if (strcmp(GName,ALL) && strcmp(GName,NONE)) + if (strcasecmp(GName,ALL) && strcasecmp(GName,NONE)) { /* update group record */ @@ -340,7 +340,7 @@ break; } - if ((hashkey != Gtmp->Key) || (strcmp(Gtmp->Name,GName))) + if ((hashkey != Gtmp->Key) || (strcasecmp(Gtmp->Name,GName))) { continue; } diff -Naur maui-3.2.6p19/src/moab/MJob.c maui-3.2.6p19-new/src/moab/MJob.c --- maui-3.2.6p19/src/moab/MJob.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MJob.c 2007-01-25 18:01:28.000000000 +0000 @@ -2507,7 +2507,7 @@ { /* if name is already in hash table... */ - if (!strcmp(MJobName[index].Name,QJobID)) + if (!strcasecmp(MJobName[index].Name,QJobID)) { tmpJ = MJob[MJobName[index].Index]; @@ -2515,7 +2515,7 @@ *JP = tmpJ; if ((tmpJ == NULL) || - ((tmpJ->Name[0] != '\0') && (tmpJ->Name[0] != '\1') && strcmp(tmpJ->Name,QJobID))) + ((tmpJ->Name[0] != '\0') && (tmpJ->Name[0] != '\1') && strcasecmp(tmpJ->Name,QJobID))) { /* hash table is corrupt */ @@ -2626,7 +2626,7 @@ aindex++; } - if ((J->Cred.Q != NULL) && (J->Cred.Q->Name[0] != '\0') && (strcmp(J->Cred.Q->Name,DEFAULT))) + if ((J->Cred.Q != NULL) && (J->Cred.Q->Name[0] != '\0') && (strcasecmp(J->Cred.Q->Name,DEFAULT))) { J->Cred.CL[aindex].Type = maQOS; MUStrCpy(J->Cred.CL[aindex].Name,J->Cred.Q->Name,MAX_MNAME); @@ -4108,7 +4108,7 @@ { /* if name is already in hash table... */ - if (!strcmp(MJobName[index].Name,JobID)) + if (!strcasecmp(MJobName[index].Name,JobID)) { *KIndex = MJobName[index].Index; @@ -4196,7 +4196,7 @@ MJobName[index].Name, JobName); - if (!strcmp(MJobName[index].Name,JobName)) + if (!strcasecmp(MJobName[index].Name,JobName)) { MJobName[index].Name[0] = '\0'; /* Indicate Record is Empty */ MJobName[index].Index = 1; /* Indicate Record was Previously Used */ @@ -4662,7 +4662,7 @@ return(SUCCESS); } - else if (!strcmp(J->RAList[rindex],RName)) + else if (!strcasecmp(J->RAList[rindex],RName)) { return(SUCCESS); } @@ -9458,7 +9458,7 @@ for (rqindex = 0;MJ->Req[rqindex] != NULL;rqindex++) { - if (!strcmp(J->Name,MJ->Req[rqindex]->SubJobName)) + if (!strcasecmp(J->Name,MJ->Req[rqindex]->SubJobName)) { MJ->Req[rqindex]->State = mjsCompleted; } @@ -9633,7 +9633,7 @@ for (rqindex = 0;MJ->Req[rqindex] != NULL;rqindex++) { - if (!strcmp(J->Name,MJ->Req[rqindex]->SubJobName)) + if (!strcasecmp(J->Name,MJ->Req[rqindex]->SubJobName)) { MJ->Req[rqindex]->State = mjsCompleted; } @@ -11525,14 +11525,14 @@ /* FORMAT: expr ... */ /* FORMAT: REQ: () */ - if (!strcmp(ResString,"expr 1")) + if (!strcasecmp(ResString,"expr 1")) { /* no resource requirements */ return(SUCCESS); } - if (!strncmp(ResString,"expr",strlen("expr"))) + if (!strncasecmp(ResString,"expr",strlen("expr"))) { for (index = 0;index < strlen("expr");index++) ResString[index] = ' '; @@ -11598,7 +11598,7 @@ for (index = 0;MRMRRes[index].RRIndex != -1;index++) { if ((MRMRRes[index].RName[RMIndex] != NULL) && - !strcmp(MRMRRes[index].RName[RMIndex],AName)) + !strcasecmp(MRMRRes[index].RName[RMIndex],AName)) { break; } @@ -11670,7 +11670,7 @@ { case mrrArch: - if ((ValLine[0] != '\0') && strcmp(ValLine,"any") && (CIndex == mcmpEQ)) + if ((ValLine[0] != '\0') && strcasecmp(ValLine,"any") && (CIndex == mcmpEQ)) { if ((RQ->Arch = MUMAGetIndex(eArch,ValLine,mAdd)) == FAILURE) { @@ -11799,7 +11799,7 @@ case mrrOpSys: - if ((ValLine[0] != '\0') && strcmp(ValLine,"any") && (CIndex == mcmpEQ)) + if ((ValLine[0] != '\0') && strcasecmp(ValLine,"any") && (CIndex == mcmpEQ)) { if ((RQ->Opsys = MUMAGetIndex(eOpsys,ValLine,mAdd)) == FAILURE) { @@ -12620,7 +12620,7 @@ tmpR.DefaultQMHost, MSched.DefaultDomain); - if (strcmp(ptr,LJobName)) + if (strcasecmp(ptr,LJobName)) { /* job names do not match */ diff -Naur maui-3.2.6p19/src/moab/MLog.c maui-3.2.6p19-new/src/moab/MLog.c --- maui-3.2.6p19/src/moab/MLog.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MLog.c 2007-01-25 18:01:28.000000000 +0000 @@ -178,9 +178,9 @@ MLogOpen(Iteration); } - else if ((strcmp(LogFile,"N/A") != 0) && - (strcmp(NewLogFile,"N/A") != 0) && - (strcmp(LogFile,NewLogFile) != 0)) + else if ((strcasecmp(LogFile,"N/A") != 0) && + (strcasecmp(NewLogFile,"N/A") != 0) && + (strcasecmp(LogFile,NewLogFile) != 0)) { strncpy(LogFile,NewLogFile,MAX_LOGNAME); LogFile[MAX_LOGNAME] = '\0'; diff -Naur maui-3.2.6p19/src/moab/MNode.c maui-3.2.6p19-new/src/moab/MNode.c --- maui-3.2.6p19/src/moab/MNode.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MNode.c 2007-01-25 18:01:29.000000000 +0000 @@ -387,7 +387,7 @@ strcpy(tmpLName,MNodeAdjustName(N->Name,1)); - if (strcmp(tmpSName,tmpLName)) + if (strcasecmp(tmpSName,tmpLName)) { /* search long names */ @@ -643,7 +643,7 @@ break; } - if (!strcmp(otype,"CLASS")) + if (!strcasecmp(otype,"CLASS")) { mclass_t *C; @@ -2452,7 +2452,7 @@ if ((NName == NULL) || (NName[0] == '\0')) return(FAILURE); - if (!strcmp(NName,"DEFAULT")) + if (!strcasecmp(NName,"DEFAULT")) { if (NP != NULL) *NP = &MSched.DefaultN; @@ -2494,7 +2494,7 @@ continue; } - if (strncmp(QHostName,N->Name,len)) + if (strncasecmp(QHostName,N->Name,len)) { /* partial host names must match */ @@ -2514,7 +2514,7 @@ strcpy(LNetwork,MSched.DefaultDomain); } - if (strcmp(QHostName,LHostName)) + if (strcasecmp(QHostName,LHostName)) { /* host names must match */ @@ -2523,7 +2523,7 @@ if ((QNetwork[0] != '\0') && (LNetwork[0] != '\0') && - strcmp(QNetwork,LNetwork)) + strcasecmp(QNetwork,LNetwork)) { /* network names must match */ @@ -5525,14 +5525,14 @@ if (C[0] != '\0') { if ((C[strlen(C) - 1] == '$') && - !strncmp(FString,C,strlen(C) - 1) && + !strncasecmp(FString,C,strlen(C) - 1) && isdigit(FString[strlen(C) - 1])) { ptr = &FString[strlen(C) - 1]; N->ProcSpeed = strtol(ptr,NULL,0); } - else if (!strncmp(FString,C,strlen(C))) + else if (!strncasecmp(FString,C,strlen(C))) { ptr = &FString[strlen(C)]; @@ -5545,14 +5545,14 @@ if (C[0] != '\0') { if ((C[strlen(C) - 1] == '$') && - !strncmp(FString,C,strlen(C) - 1) && + !strncasecmp(FString,C,strlen(C) - 1) && isdigit(FString[strlen(C) - 1])) { ptr = &FString[strlen(C) - 1]; MUStrCpy(N->NodeType,ptr,sizeof(N->NodeType)); } - else if (!strncmp(FString,C,strlen(C))) + else if (!strncasecmp(FString,C,strlen(C))) { ptr = &FString[strlen(C)]; @@ -5562,7 +5562,7 @@ C = MSched.PartitionFeatureHeader; - if ((C[0] != '\0') && !strncmp(FString,C,strlen(C))) + if ((C[0] != '\0') && !strncasecmp(FString,C,strlen(C))) { mpar_t *P; @@ -5579,13 +5579,13 @@ } } - if (!strncmp(FString,"xm",2)) + if (!strncasecmp(FString,"xm",2)) { /* handle scheduler extension feature */ ptr = &FString[strlen("xm")]; - if (!strncmp(ptr + 2,"ML",2)) + if (!strncasecmp(ptr + 2,"ML",2)) { /* max load */ @@ -5938,7 +5938,7 @@ for (nindex = 1;nindex < MAX_MNETTYPE;nindex++) { - if (!strcmp(tmpName,S->NetName[nindex]) || + if (!strcasecmp(tmpName,S->NetName[nindex]) || (Address == S->NetAddr[nindex])) { break; @@ -6593,7 +6593,7 @@ break; } - if ((FName != NULL) && !strcmp(FName,F->Name)) + if ((FName != NULL) && !strcasecmp(FName,F->Name)) { /* frame already exists */ @@ -6731,9 +6731,9 @@ continue; } - if ((SFName != NULL) && strcmp(SFName,NONE)) + if ((SFName != NULL) && strcasecmp(SFName,NONE)) { - if (strcmp(SFName,F->Name)) + if (strcasecmp(SFName,F->Name)) continue; } @@ -6801,7 +6801,7 @@ BPtr[0] = '\0'; - if ((RID == NULL) || !strcmp(RID,NONE)) + if ((RID == NULL) || !strcasecmp(RID,NONE)) { ResFound = TRUE; } @@ -6914,9 +6914,9 @@ /* continue if specified res not matched */ - if ((RID != NULL) && strcmp(RID,NONE)) + if ((RID != NULL) && strcasecmp(RID,NONE)) { - if (strcmp(RID,R->Name) && + if (strcasecmp(RID,R->Name) && !(DFlags & (1 << mcmVerbose)) && !(DFlags & (1 << mcmSummary))) { @@ -6935,11 +6935,11 @@ { int srindex; - if (strcmp(RID,R->Name) && (R->Type == mrtJob)) + if (strcasecmp(RID,R->Name) && (R->Type == mrtJob)) { for (srindex = 0;ARes[srindex] != NULL;srindex++) { - if (!strcmp(ARes[srindex]->Name,R->Name)) + if (!strcasecmp(ARes[srindex]->Name,R->Name)) break; } diff -Naur maui-3.2.6p19/src/moab/MPBSI.c maui-3.2.6p19-new/src/moab/MPBSI.c --- maui-3.2.6p19/src/moab/MPBSI.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MPBSI.c 2007-01-25 18:01:29.000000000 +0000 @@ -980,7 +980,7 @@ for (AP = PJob->attribs;AP != NULL;AP = AP->next) { - if (!strcmp(AP->name,ATTR_state)) + if (!strcasecmp(AP->name,ATTR_state)) { switch (AP->value[0]) { @@ -1051,7 +1051,7 @@ } /* END switch (AP->value[0]) */ break; - } /* END (!strcmp(AP->name,ATTR_state)) */ + } /* END (!strcasecmp(AP->name,ATTR_state)) */ } /* END for (AP) */ return(SUCCESS); @@ -1137,9 +1137,9 @@ (AP->value != NULL) ? AP->value : "NULL", (AP->resource != NULL) ? AP->resource : "NULL"); - if (!strcmp(AP->name,"resources_max")) + if (!strcasecmp(AP->name,"resources_max")) { - if (!strcmp(AP->resource,"ncpus")) + if (!strcasecmp(AP->resource,"ncpus")) { MSched.DefaultN.CRes.Procs = (int)strtol(AP->value,NULL,10); @@ -1148,15 +1148,15 @@ /* NYI */ } - else if (!strcmp(AP->name,"resources_default")) + else if (!strcasecmp(AP->name,"resources_default")) { /* NYI */ } - else if (!strcmp(AP->name,"resources_available")) + else if (!strcasecmp(AP->name,"resources_available")) { /* NYI */ } - else if (!strcmp(AP->name,"default_queue")) + else if (!strcasecmp(AP->name,"default_queue")) { if (MSched.DefaultC != NULL) { @@ -1166,7 +1166,7 @@ sizeof(MSched.DefaultC->Name)); } } - else if (!strcmp(AP->name,"pbs_version")) + else if (!strcasecmp(AP->name,"pbs_version")) { char tmpLine[MMAX_LINE]; @@ -1483,7 +1483,7 @@ { /* load limited set of queue attributes (priority, state, limits, ACLs) */ - if (!strcmp(AP->name,ATTR_p)) + if (!strcasecmp(AP->name,ATTR_p)) { /* queue priority */ @@ -1503,7 +1503,7 @@ continue; } - if (!strcmp(AP->name,ATTR_start)) + if (!strcasecmp(AP->name,ATTR_start)) { /* evaluate queue state */ @@ -1521,7 +1521,7 @@ continue; } - if (!strcmp(AP->name,"max_running")) + if (!strcasecmp(AP->name,"max_running")) { /* support max running policy */ @@ -1540,7 +1540,7 @@ continue; } - if (!strcmp(AP->name,"max_user_run")) + if (!strcasecmp(AP->name,"max_user_run")) { /* support max active job per user per queue policy */ @@ -1564,23 +1564,23 @@ continue; } - if (!strcmp(AP->name,ATTR_aclhten)) + if (!strcasecmp(AP->name,ATTR_aclhten)) { if (MUBoolFromString(AP->value,FALSE) == TRUE) { ACLHostEnabled = TRUE; } } - else if (!strcmp(AP->name,"queue_type")) + else if (!strcasecmp(AP->name,"queue_type")) { - if (strcmp(AP->value,"Execution")) + if (strcasecmp(AP->value,"Execution")) { /* queue is not execution queue */ C->NonExeType = TRUE; } } - else if (!strcmp(AP->name,ATTR_aclhost)) + else if (!strcasecmp(AP->name,ATTR_aclhost)) { /* list of hosts which can submit to queue */ @@ -1592,7 +1592,7 @@ while (ptr != NULL) { - if ((SpecN == NULL) || !strcmp(SpecN->Name,ptr)) + if ((SpecN == NULL) || !strcasecmp(SpecN->Name,ptr)) { if (MNodeFind(ptr,&N) == FAILURE) { @@ -1629,10 +1629,10 @@ ptr = MUStrTok(NULL,",+",&TokPtr); } /* END while (ptr != NULL) */ } - else if (!strcmp(AP->name,"resources_default")) + else if (!strcasecmp(AP->name,"resources_default")) { - if (!strcmp(AP->resource,"neednodes") || - !strcmp(AP->resource,"select")) + if (!strcasecmp(AP->resource,"neednodes") || + !strcasecmp(AP->resource,"select")) { char *ptr; @@ -1657,9 +1657,9 @@ } /* END if (*ptr != '\0') */ } } - else if (!strcmp(AP->name,"resources_max")) + else if (!strcasecmp(AP->name,"resources_max")) { - if (!strcmp(AP->resource,"nodect")) + if (!strcasecmp(AP->resource,"nodect")) { /* NOTE: PBS 'nodect' constrains job nodes */ @@ -1670,8 +1670,8 @@ (void **)AP->value, mdfString, mSet); - } /* END if (!strcmp(AP->resource,"nodect")) */ - else if (!strcmp(AP->resource,"ncpus")) + } /* END if (!strcasecmp(AP->resource,"nodect")) */ + else if (!strcasecmp(AP->resource,"ncpus")) { /* NOTE: PBS 'ncpus' constrains job procs */ @@ -1682,7 +1682,7 @@ (void **)AP->value, mdfString, mSet); - } /* END if (!strcmp(AP->resource,"ncpus")) */ + } /* END if (!strcasecmp(AP->resource,"ncpus")) */ } } /* END for (AP) */ @@ -1784,7 +1784,7 @@ for (AP = PNode->attribs;AP != NULL;AP = AP->next) { - if (!strcmp(AP->name,ATTR_NODE_state)) + if (!strcasecmp(AP->name,ATTR_NODE_state)) { if (strstr(AP->value,ND_down) || strstr(AP->value,ND_state_unknown)) { @@ -1824,7 +1824,7 @@ } break; - } /* END if (!strcmp(AP->name,ATTR_NODE_state)) */ + } /* END if (!strcasecmp(AP->name,ATTR_NODE_state)) */ } /* END for (AP) */ if (AP == NULL) @@ -2404,12 +2404,12 @@ { /* following are mutually exclusive */ - if (!strcmp(AP->name,"status")) + if (!strcasecmp(AP->name,"status")) { R->U.PBS.SSSIsEnabled = TRUE; } - if (!strcmp(AP->name,"resources_assigned")) + if (!strcasecmp(AP->name,"resources_assigned")) { R->U.PBS.PBS5IsEnabled = TRUE; } @@ -2424,7 +2424,7 @@ { /* following are mutually exclusive */ - if (strcmp(AP->name,"status")) + if (strcasecmp(AP->name,"status")) continue; __MPBSIGetSSSStatus(N,AP->value); @@ -2503,7 +2503,7 @@ for (AP = PNode->attribs;AP != NULL;AP = AP->next) { - if (!strcmp(AP->name,ATTR_NODE_jobs)) + if (!strcasecmp(AP->name,ATTR_NODE_jobs)) { /* FORMAT: [,] */ @@ -2643,11 +2643,11 @@ ptr = MUStrTok(NULL,", \t",&TokPtr); } /* END while (ptr != NULL) */ } - else if (!strcmp(AP->name,ATTR_NODE_ntype)) + else if (!strcasecmp(AP->name,ATTR_NODE_ntype)) { /* what is strict definition of time_shared vs cluster */ - if (!strcmp(AP->value,ND_cluster)) + if (!strcasecmp(AP->value,ND_cluster)) { /* NOTE: FIXME: cluster vs time_shared must be handled, but not this way */ /* @@ -2655,7 +2655,7 @@ */ } } - else if (!strcmp(AP->name,ATTR_NODE_properties)) + else if (!strcasecmp(AP->name,ATTR_NODE_properties)) { if (R->U.PBS.PBS5IsEnabled == FALSE) { @@ -2670,8 +2670,8 @@ ptr = MUStrTok(NULL,", \t",&TokPtr); } /* END while (ptr != NULL) */ } - } /* END else if (!strcmp()) */ - else if (!strcmp(AP->name,ATTR_NODE_np)) + } /* END else if (!strcasecmp()) */ + else if (!strcasecmp(AP->name,ATTR_NODE_np)) { /* set number of processors */ @@ -2680,7 +2680,7 @@ if (MSched.NodeCPUOverCommitFactor > 0.0) N->CRes.Procs = (int)(N->CRes.Procs * MSched.NodeCPUOverCommitFactor); } - else if (!strcmp(AP->name,"queue")) + else if (!strcasecmp(AP->name,"queue")) { /* determine queues supported by node */ @@ -2688,15 +2688,15 @@ N->PrivateQueue = TRUE; } - else if (!strcmp(AP->name,"resources_available")) + else if (!strcasecmp(AP->name,"resources_available")) { - if (!strcmp(AP->resource,"mem")) + if (!strcasecmp(AP->resource,"mem")) { N->CRes.Mem = (MPBSGetResKVal(AP->value) >> 10); N->ARes.Mem = MIN(N->ARes.Mem,N->CRes.Mem); } - else if (!strcmp(AP->resource,"vmem")) + else if (!strcasecmp(AP->resource,"vmem")) { N->CRes.Swap = (MPBSGetResKVal(AP->value) >> 10); @@ -2933,42 +2933,42 @@ break; } - if (!strncmp(Value,"ncpus=",strlen("ncpus="))) + if (!strncasecmp(Value,"ncpus=",strlen("ncpus="))) { ptr = Value + strlen("ncpus="); if (*ptr != '?') N->CRes.Procs = (int)strtol(ptr,NULL,10); } - else if (!strncmp(Value,"arch=",strlen("arch="))) + else if (!strncasecmp(Value,"arch=",strlen("arch="))) { ptr = Value + strlen("arch="); if (*ptr != '?') N->Arch = MUMAGetIndex(eArch,ptr,mAdd); } - else if (!strncmp(Value,"physmem=",strlen("physmem="))) + else if (!strncasecmp(Value,"physmem=",strlen("physmem="))) { ptr = Value + strlen("physmem="); if (*ptr != '?') N->CRes.Mem = (MPBSGetResKVal(ptr) >> 10); } - else if (!strncmp(Value,"totmem=",strlen("totmem="))) + else if (!strncasecmp(Value,"totmem=",strlen("totmem="))) { ptr = Value + strlen("totmem="); if (*ptr != '?') TotMem = (MPBSGetResKVal(ptr) >> 10); } - else if (!strncmp(Value,"availmem=",strlen("availmem="))) + else if (!strncasecmp(Value,"availmem=",strlen("availmem="))) { ptr = Value + strlen("availmem="); if (*ptr != '?') N->ARes.Swap = (MPBSGetResKVal(ptr) >> 10); } - else if (!strncmp(Value,"loadave=",strlen("loadave="))) + else if (!strncasecmp(Value,"loadave=",strlen("loadave="))) { ptr = Value + strlen("loadave="); @@ -2980,7 +2980,7 @@ N->Load = dval; } } - else if (!strncmp(Value,DiskLine,strlen(DiskLine))) + else if (!strncasecmp(Value,DiskLine,strlen(DiskLine))) { ptr = Value + strlen(DiskLine) + 1; @@ -3093,13 +3093,13 @@ { /* following are mutually exclusive */ - if (!strcmp(AP->name,"status")) + if (!strcasecmp(AP->name,"status")) { R->U.PBS.SSSIsEnabled = TRUE; break; } - else if (!strcmp(AP->name,"resources_assigned")) + else if (!strcasecmp(AP->name,"resources_assigned")) { R->U.PBS.PBS5IsEnabled = TRUE; @@ -3114,7 +3114,7 @@ { /* following are mutually exclusive */ - if (strcmp(AP->name,"status")) + if (strcasecmp(AP->name,"status")) continue; /* get node info from 'status' attribute */ @@ -3200,7 +3200,7 @@ for (AP = PNode->attribs;AP != NULL;AP = AP->next) { - if (!strcmp(AP->name,ATTR_NODE_jobs)) + if (!strcasecmp(AP->name,ATTR_NODE_jobs)) { char JobID[MAX_MNAME]; @@ -3353,16 +3353,16 @@ ptr = MUStrTok(NULL,", \t",&TokPtr); } /* END while (ptr != NULL) */ } - else if (!strcmp(AP->name,ATTR_NODE_ntype)) + else if (!strcasecmp(AP->name,ATTR_NODE_ntype)) { /* NOTE: what is strict definition of time_shared vs cluster? */ - if (!strcmp(AP->value,ND_cluster)) + if (!strcasecmp(AP->value,ND_cluster)) { N->AP.HLimit[mptMaxProc][0] = N->CRes.Procs; } } - else if (!strcmp(AP->name,ATTR_NODE_properties)) + else if (!strcasecmp(AP->name,ATTR_NODE_properties)) { MUStrCpy(tmpBuffer,AP->value,sizeof(tmpBuffer)); @@ -3377,7 +3377,7 @@ ptr = MUStrTok(NULL,", \t",&TokPtr); } } - else if (!strcmp(AP->name,ATTR_NODE_np)) + else if (!strcasecmp(AP->name,ATTR_NODE_np)) { /* set virtual processors */ @@ -3386,21 +3386,21 @@ if (MSched.NodeCPUOverCommitFactor > 0.0) N->CRes.Procs = (int)(N->CRes.Procs * MSched.NodeCPUOverCommitFactor); } - else if (!strcmp(AP->name,"resources_available")) + else if (!strcasecmp(AP->name,"resources_available")) { - if (!strcmp(AP->resource,"mem")) + if (!strcasecmp(AP->resource,"mem")) { N->CRes.Mem = (MPBSGetResKVal(AP->value) >> 10); N->ARes.Mem = MIN(N->ARes.Mem,N->CRes.Mem); } - else if (!strcmp(AP->resource,"vmem")) + else if (!strcasecmp(AP->resource,"vmem")) { N->CRes.Swap = (MPBSGetResKVal(AP->value) >> 10); N->ARes.Swap = MIN(N->ARes.Swap,N->CRes.Swap); } - else if (!strcmp(AP->resource,"ncpus")) + else if (!strcasecmp(AP->resource,"ncpus")) { N->CRes.Procs = strtol(AP->value,NULL,10); } @@ -3840,13 +3840,13 @@ for (AP = PJob->attribs;AP != NULL;AP = AP->next) { - if (!strcmp(AP->name,ATTR_qtime)) + if (!strcasecmp(AP->name,ATTR_qtime)) { /* get queuetime (epochtime) */ J->SubmitTime = strtol(AP->value,NULL,10); } - else if (!strcmp(AP->name,ATTR_etime)) + else if (!strcasecmp(AP->name,ATTR_etime)) { /* get runnable time (epochtime) (ie, hold released) */ @@ -3854,19 +3854,19 @@ J->SystemQueueTime = MAX(J->SystemQueueTime,ETime); } - else if (!strcmp(AP->name,ATTR_mtime)) + else if (!strcasecmp(AP->name,ATTR_mtime)) { /* get modify time (epochtime) (ie, job started or qaltered) */ MTime = strtol(AP->value,NULL,10); } - else if (!strcmp(AP->name,"session_id")) + else if (!strcasecmp(AP->name,"session_id")) { /* get job session ID */ J->SessionID = (int)strtol(AP->value,NULL,10); } - else if (!strcmp(AP->name,"exec_host")) + else if (!strcasecmp(AP->name,"exec_host")) { /* load job node list */ @@ -3879,15 +3879,15 @@ __MPBSGetTaskList(J,tmpBuffer,TaskList,TRUE); } - else if (!strcmp(AP->name,ATTR_comment)) + else if (!strcasecmp(AP->name,ATTR_comment)) { /* get comment */ /* not used */ } - else if (!strcmp(AP->name,ATTR_used)) + else if (!strcasecmp(AP->name,ATTR_used)) { - if (!strcmp(AP->resource,"walltime")) + if (!strcasecmp(AP->resource,"walltime")) { WallTime = MPBSGetResKVal(AP->value); @@ -3897,28 +3897,28 @@ WallTime, AP->value); } - else if (!strcmp(AP->resource,"cpupercent")) + else if (!strcasecmp(AP->resource,"cpupercent")) { if ((J->State == mjsStarting) || (J->State == mjsRunning)) { CPUPercent = strtol(AP->value,NULL,10); } } - else if (!strcmp(AP->resource,"mem")) + else if (!strcasecmp(AP->resource,"mem")) { if ((J->State == mjsStarting) || (J->State == mjsRunning)) { RQ->URes.Mem = MPBSGetResKVal(AP->value) >> 10; } } - else if (!strcmp(AP->resource,"vmem")) + else if (!strcasecmp(AP->resource,"vmem")) { if ((J->State == mjsStarting) || (J->State == mjsRunning)) { RQ->URes.Swap = MPBSGetResKVal(AP->value) >> 10; } } - else if (!strcmp(AP->resource,"cput")) + else if (!strcasecmp(AP->resource,"cput")) { if ((J->State == mjsStarting) || (J->State == mjsRunning) || (J->State == mjsCompleted)) { @@ -3926,7 +3926,7 @@ } } } - else if (!strcmp(AP->name,ATTR_a)) + else if (!strcasecmp(AP->name,ATTR_a)) { long tmpL; @@ -3939,11 +3939,11 @@ MJobSetAttr(J,mjaReqSMinTime,(void **)&tmpL,0,mSet); } - else if (!strcmp(AP->name,ATTR_l)) + else if (!strcasecmp(AP->name,ATTR_l)) { /* required resources may be modified via 'qalter' */ - if (!strcmp(AP->resource,"walltime")) + if (!strcasecmp(AP->resource,"walltime")) { WCLimit = MPBSGetResKVal(AP->value); @@ -3965,7 +3965,7 @@ J->SpecWCLimit[1] = WCLimit; } } - else if (!strcmp(AP->resource,"pmem")) + else if (!strcasecmp(AP->resource,"pmem")) { /* Maximum 'per processor' real memory allowed */ @@ -3979,7 +3979,7 @@ RQ->MemCmp = mcmpGE; } } - else if (!strcmp(AP->resource,"pvmem")) + else if (!strcasecmp(AP->resource,"pvmem")) { tmpL = (MPBSGetResKVal(AP->value) >> 10); @@ -3991,15 +3991,15 @@ RQ->SwapCmp = mcmpGE; } } - else if (!strcmp(AP->resource,"mem")) + else if (!strcasecmp(AP->resource,"mem")) { MaxJobMem = (MPBSGetResKVal(AP->value) >> 10); } - else if (!strcmp(AP->resource,"vmem")) + else if (!strcasecmp(AP->resource,"vmem")) { MaxJobSwap = (MPBSGetResKVal(AP->value) >> 10); } - else if (!strcmp(AP->resource,"file")) + else if (!strcasecmp(AP->resource,"file")) { /* NOTE: treat file as consumable disk and required disk */ @@ -4013,7 +4013,7 @@ RQ->DiskCmp = mcmpGE; } } - else if (!strcmp(AP->resource,"nodect")) + else if (!strcasecmp(AP->resource,"nodect")) { NodeCount = (int)strtol(AP->value,NULL,10); @@ -4024,13 +4024,13 @@ RQ->TaskCount = MAX(RQ->TaskCount,NodeCount); } } - else if (!strcmp(AP->resource,"nodes")) + else if (!strcasecmp(AP->resource,"nodes")) { strcpy(tmpBuffer,AP->value); __MPBSGetTaskList(J,tmpBuffer,TaskList,FALSE); } - else if (!strcmp(AP->resource,"ncpus")) + else if (!strcasecmp(AP->resource,"ncpus")) { int PReq; @@ -4078,7 +4078,7 @@ } } /* END if (NCPUs != PReq) */ } - else if (!strcmp(AP->resource,"cput")) + else if (!strcasecmp(AP->resource,"cput")) { tmpL = MPBSGetResKVal(AP->value); @@ -4087,7 +4087,7 @@ J->CPULimit = tmpL; } } - else if (!strcmp(AP->resource,"mem")) + else if (!strcasecmp(AP->resource,"mem")) { tmpL = (MPBSGetResKVal(AP->value) >> 10); @@ -4108,7 +4108,7 @@ } } } - else if (!strcmp(AP->resource,"software")) + else if (!strcasecmp(AP->resource,"software")) { /* NOTE: old hack (map software to node feature */ @@ -4150,7 +4150,7 @@ /* host (master node) not yet supported for PBS */ } } - else if (!strcmp(AP->name,ATTR_queue)) + else if (!strcasecmp(AP->name,ATTR_queue)) { MReqSetAttr(J,RQ,mrqaReqClass,(void **)AP->value,mdfString,mSet); } @@ -4852,7 +4852,7 @@ while (ptr2 != NULL) { - if (strncmp(ptr2,"ppn=",strlen("ppn=")) == 0) + if (strncasecmp(ptr2,"ppn=",strlen("ppn=")) == 0) { ppn = (int)strtol(ptr2 + strlen("ppn="),NULL,10); @@ -5219,48 +5219,48 @@ (AP->value != NULL) ? AP->value : "NULL", (AP->resource != NULL) ? AP->resource : "NULL"); - if (!strcmp(AP->name,"resources_available")) + if (!strcasecmp(AP->name,"resources_available")) { - if (!strcmp(AP->resource,"arch")) + if (!strcasecmp(AP->resource,"arch")) { if (AP->value[0] != '?') N->Arch = MUMAGetIndex(eArch,AP->value,mAdd); } - else if (!strcmp(AP->resource,"opsys")) + else if (!strcasecmp(AP->resource,"opsys")) { if (AP->value[0] != '?') N->ActiveOS = MUMAGetIndex(eOpsys,AP->value,mAdd); } - else if (!strcmp(AP->resource,"mem")) + else if (!strcasecmp(AP->resource,"mem")) { N->CRes.Mem = (MPBSGetResKVal(AP->value) >> 10); N->ARes.Mem = MIN(N->ARes.Mem,N->CRes.Mem); } - else if (!strcmp(AP->resource,"vmem")) + else if (!strcasecmp(AP->resource,"vmem")) { N->CRes.Swap = (MPBSGetResKVal(AP->value) >> 10); N->ARes.Swap = MIN(N->ARes.Swap,N->CRes.Swap); } - else if (!strcmp(AP->resource,"ncpus")) + else if (!strcasecmp(AP->resource,"ncpus")) { N->CRes.Procs = (int)strtol(AP->value,NULL,10); } } - else if (!strcmp(AP->name,"license")) + else if (!strcasecmp(AP->name,"license")) { /* NOTE: value 'l'??? */ MNodeSetAttr(N,mnaGRes,(void **)AP->value,mdfString,mSet); } - else if (!strcmp(AP->name,"pcpus")) + else if (!strcasecmp(AP->name,"pcpus")) { /* NYI */ /* NOTE: value ''??? */ } - else if (!strcmp(AP->name,"properties")) + else if (!strcasecmp(AP->name,"properties")) { char *ptr; char *TokPtr; @@ -5358,13 +5358,13 @@ RQ = J->Req[0]; - if (!strcmp(AP->name,ATTR_qtime)) + if (!strcasecmp(AP->name,ATTR_qtime)) { /* get queuetime (epochtime) */ J->SubmitTime = strtol(AP->value,NULL,10); } - else if (!strcmp(AP->name,ATTR_etime)) + else if (!strcasecmp(AP->name,ATTR_etime)) { /* get eligible time (epochtime) (ie, hold released) */ @@ -5372,19 +5372,19 @@ J->SystemQueueTime = MAX(J->SystemQueueTime,TA->ETime); } - else if (!strcmp(AP->name,ATTR_mtime)) + else if (!strcasecmp(AP->name,ATTR_mtime)) { /* get modify time (epochtime) (ie, job started or qalter'd) */ TA->MTime = strtol(AP->value,NULL,10); } - else if (!strcmp(AP->name,"session_id")) + else if (!strcasecmp(AP->name,"session_id")) { /* get job session ID */ J->SessionID = (int)strtol(AP->value,NULL,10); } - else if (!strcmp(AP->name,"exec_host")) + else if (!strcasecmp(AP->name,"exec_host")) { /* load job node list */ @@ -5397,18 +5397,18 @@ __MPBSGetTaskList(J,AP->value,TaskList,TRUE); } } - else if (!strcmp(AP->name,ATTR_r)) + else if (!strcasecmp(AP->name,ATTR_r)) { if ((AP->value != NULL) && (MUBoolFromString(AP->value,FALSE) == TRUE)) J->SpecFlags |= (1 << mjfRestartable); } - else if (!strcmp(AP->name,ATTR_comment)) + else if (!strcasecmp(AP->name,ATTR_comment)) { /* get comment */ /* ignore PBS comments for now */ } - else if (!strcmp(AP->name,"stagein")) + else if (!strcasecmp(AP->name,"stagein")) { /* FORMAT: [@]: */ @@ -5427,7 +5427,7 @@ if (ptr != NULL) J->SIData->DstFileName = strdup(ptr); } - else if (!strcmp(AP->name,"stageout")) + else if (!strcasecmp(AP->name,"stageout")) { /* FORMAT: :[@] */ @@ -5445,7 +5445,7 @@ if (ptr != NULL) J->SOData->DstHostName = strdup(ptr); } - else if (!strcmp(AP->name,"x")) + else if (!strcasecmp(AP->name,"x")) { MJobSetAttr(J,mjaRMXString,(void **)AP->value,mdfString,0); @@ -5462,7 +5462,7 @@ return(FAILURE); } } - else if (!strcmp(AP->name,"qos")) + else if (!strcasecmp(AP->name,"qos")) { if (MQOSFind(AP->value,&J->QReq) == SUCCESS) { @@ -5471,7 +5471,7 @@ J->Name); } } - else if (!strcmp(AP->name,"depend")) + else if (!strcasecmp(AP->name,"depend")) { char *ptr; char *TokPtr; @@ -5499,11 +5499,11 @@ return(FAILURE); } - if (!strncmp(ptr,"before",strlen("before"))) + if (!strncasecmp(ptr,"before",strlen("before"))) { /* ignore before dependencies for now */ } - else if (!strcmp(ptr,"after")) + else if (!strcasecmp(ptr,"after")) { DType = mjdJobStart; } @@ -5518,8 +5518,8 @@ MJobSetDependency(J,DType,DValue); } - else if (!strcmp(AP->name,ATTR_euser) || - !strcmp(AP->name,ATTR_owner)) + else if (!strcasecmp(AP->name,ATTR_euser) || + !strcasecmp(AP->name,ATTR_owner)) { /* get user name */ @@ -5549,7 +5549,7 @@ return(FAILURE); } } - else if (!strcmp(AP->name,ATTR_egroup)) + else if (!strcasecmp(AP->name,ATTR_egroup)) { /* get group name */ @@ -5564,7 +5564,7 @@ return(FAILURE); } } - else if (!strcmp(AP->name,ATTR_A)) + else if (!strcasecmp(AP->name,ATTR_A)) { /* get account name */ @@ -5575,9 +5575,9 @@ AP->value); } } - else if (!strcmp(AP->name,ATTR_used)) + else if (!strcasecmp(AP->name,ATTR_used)) { - if (!strcmp(AP->resource,"walltime")) + if (!strcasecmp(AP->resource,"walltime")) { TA->WallTime = MPBSGetResKVal(AP->value); @@ -5588,28 +5588,28 @@ J->AWallTime = RQ->RMWTime; } } - else if (!strcmp(AP->resource,"cpupercent")) + else if (!strcasecmp(AP->resource,"cpupercent")) { if ((J->State == mjsStarting) || (J->State == mjsRunning)) { RQ->URes.Procs = strtol(AP->value,NULL,10); } } - else if (!strcmp(AP->resource,"mem")) + else if (!strcasecmp(AP->resource,"mem")) { if ((J->State == mjsStarting) || (J->State == mjsRunning)) { RQ->URes.Mem = MPBSGetResKVal(AP->value) >> 10; } } - else if (!strcmp(AP->resource,"vmem")) + else if (!strcasecmp(AP->resource,"vmem")) { if ((J->State == mjsStarting) || (J->State == mjsRunning)) { RQ->URes.Swap = MPBSGetResKVal(AP->value) >> 10; } } - else if (!strcmp(AP->resource,"cput")) + else if (!strcasecmp(AP->resource,"cput")) { if ((J->State == mjsStarting) || (J->State == mjsRunning) || @@ -5619,13 +5619,13 @@ } } } - else if (!strcmp(AP->name,ATTR_l)) + else if (!strcasecmp(AP->name,ATTR_l)) { /* required resources */ /* get resource information */ - if (!strcmp(AP->resource,"neednodes") || !strcmp(AP->resource,"select")) + if (!strcasecmp(AP->resource,"neednodes") || !strcasecmp(AP->resource,"select")) { /* record PBS neednodes value */ @@ -5639,7 +5639,7 @@ __MPBSGetTaskList(J,AP->value,NULL,FALSE); } - else if (!strcmp(AP->resource,"nodes")) + else if (!strcasecmp(AP->resource,"nodes")) { /* node specification */ @@ -5661,23 +5661,23 @@ mhrPolicyViolation, "multi-req PBS jobs not allowed"); } - } /* END if (!strcmp(AP->resource,"nodes")) */ - else if (!strcmp(AP->resource,"nodect")) + } /* END if (!strcasecmp(AP->resource,"nodes")) */ + else if (!strcasecmp(AP->resource,"nodect")) { TA->NodesRequested = (int)strtol(AP->value,NULL,10); J->NodesRequested = TA->NodesRequested; J->TasksRequested = MAX(J->TasksRequested,J->NodesRequested); } - else if (!strcmp(AP->resource,"arch")) + else if (!strcasecmp(AP->resource,"arch")) { RQ->Arch = MUMAGetIndex(eArch,AP->value,mAdd); } - else if (!strcmp(AP->resource,"opsys")) + else if (!strcasecmp(AP->resource,"opsys")) { RQ->Opsys = MUMAGetIndex(eOpsys,AP->value,mAdd); } - else if (!strcmp(AP->resource,"pmem")) + else if (!strcasecmp(AP->resource,"pmem")) { /* NOTE: called 'workingset'? (indiana) */ @@ -5685,7 +5685,7 @@ RQ->DRes.Mem = (MPBSGetResKVal(AP->value) >> 10); } - else if (!strcmp(AP->resource,"pvmem")) + else if (!strcasecmp(AP->resource,"pvmem")) { /* NOTE: called 'pmem'? (indiana) */ @@ -5693,19 +5693,19 @@ RQ->DRes.Swap = (MPBSGetResKVal(AP->value) >> 10); } - else if (!strcmp(AP->resource,"mem")) + else if (!strcasecmp(AP->resource,"mem")) { /* 'per job' required memory */ TA->JobMemLimit = (MPBSGetResKVal(AP->value) >> 10); } - else if (!strcmp(AP->resource,"vmem")) + else if (!strcasecmp(AP->resource,"vmem")) { /* 'per job' required swap */ TA->JobSwapLimit = (MPBSGetResKVal(AP->value) >> 10); } - else if (!strcmp(AP->resource,"file")) + else if (!strcasecmp(AP->resource,"file")) { long tmpL; @@ -5723,14 +5723,14 @@ RQ->DiskCmp = mcmpGE; } } - else if (!strcmp(AP->resource,"walltime")) + else if (!strcasecmp(AP->resource,"walltime")) { TA->WCLimit = MPBSGetResKVal(AP->value); J->SpecWCLimit[0] = TA->WCLimit; J->SpecWCLimit[1] = TA->WCLimit; } - else if (!strcmp(AP->resource,"ncpus") && (getenv("MAUIIGNNCPUS") == NULL)) + else if (!strcasecmp(AP->resource,"ncpus") && (getenv("MAUIIGNNCPUS") == NULL)) { TA->NCPUs = (int)strtol(AP->value,NULL,10); @@ -5742,13 +5742,13 @@ RQ->TaskCount = 1; RQ->NodeCount = 1; } - else if (!strcmp(AP->resource,"host")) + else if (!strcasecmp(AP->resource,"host")) { /* used only on O2K systems */ __MPBSGetTaskList(J,AP->value,NULL,FALSE); } - else if (!strcmp(AP->resource,"cput")) + else if (!strcasecmp(AP->resource,"cput")) { /* 'per job' CPU limit */ @@ -5756,13 +5756,13 @@ J->CPULimit = TA->JobCPULimit; } - else if (!strcmp(AP->resource,"pcput")) + else if (!strcasecmp(AP->resource,"pcput")) { /* 'per processor' CPU limit */ TA->ProcCPULimit = MPBSGetResKVal(AP->value); } - else if (!strcmp(AP->resource,"rmsnodes")) + else if (!strcasecmp(AP->resource,"rmsnodes")) { if (R->SubType == mrmstRMS) { @@ -5825,7 +5825,7 @@ } } } - else if (!strcmp(AP->resource,"rmspartition")) + else if (!strcasecmp(AP->resource,"rmspartition")) { if (R->SubType == mrmstRMS) { @@ -5843,7 +5843,7 @@ } } } - else if (!strcmp(AP->resource,"software")) + else if (!strcasecmp(AP->resource,"software")) { int rqindex; @@ -5905,7 +5905,7 @@ /* NO-OP */ } } - else if (!strcmp(AP->name,ATTR_a)) + else if (!strcasecmp(AP->name,ATTR_a)) { long tmpL; @@ -5920,7 +5920,7 @@ MJobSetAttr(J,mjaReqSMinTime,(void **)&tmpL,mdfLong,mSet); } - else if (!strcmp(AP->name,ATTR_queue)) + else if (!strcasecmp(AP->name,ATTR_queue)) { MReqSetAttr(J,RQ,mrqaReqClass,(void **)AP->value,mdfString,mSet); } @@ -6236,27 +6236,27 @@ /* NOTE: also available: uname, sessions, nsessions, nusers, size, idletime, resi */ - if (!strcmp(Name,"arch")) + if (!strcasecmp(Name,"arch")) { N->Arch = MUMAGetIndex(eArch,Value,mAdd); } - else if (!strcmp(Name,"opsys")) + else if (!strcasecmp(Name,"opsys")) { N->ActiveOS = MUMAGetIndex(eOpsys,Value,mAdd); } - else if (!strcmp(Name,"totmem")) + else if (!strcasecmp(Name,"totmem")) { TotMem = (MPBSGetResKVal(Value) >> 10); } - else if (!strcmp(Name,"availmem")) + else if (!strcasecmp(Name,"availmem")) { N->ARes.Swap = (MPBSGetResKVal(Value) >> 10); } - else if (!strcmp(Name,"physmem")) + else if (!strcasecmp(Name,"physmem")) { N->CRes.Mem = (MPBSGetResKVal(Value) >> 10); } - else if (!strcmp(Name,"size")) + else if (!strcasecmp(Name,"size")) { char *ptr; char *tok; @@ -6269,11 +6269,11 @@ N->CRes.Disk = (MPBSGetResKVal(tok) >> 10); } } - else if (!strcmp(Name,"ncpus")) + else if (!strcasecmp(Name,"ncpus")) { N->CRes.Procs = (int)strtol(Value,NULL,10); } - else if (!strcmp(Name,"loadave")) + else if (!strcasecmp(Name,"loadave")) { double tmpD; @@ -6281,10 +6281,10 @@ if (*tail == '\0') N->Load = tmpD; - } /* END else if (!strcmp(Name,"loadave")) */ - else if (!strcmp(Name,"message")) + } /* END else if (!strcasecmp(Name,"loadave")) */ + else if (!strcasecmp(Name,"message")) { - if (!strncmp(Value,"ERROR:",strlen("ERROR:"))) + if (!strncasecmp(Value,"ERROR:",strlen("ERROR:"))) { DBG(7,fPBS) DPrint("INFO: node '%s' marked down - reports internal error '%s'\n", N->Name, @@ -6292,7 +6292,7 @@ MNodeSetState(N,mnsDown,0); } - } /* END else if (!strcmp(Name,"message")) */ + } /* END else if (!strcasecmp(Name,"message")) */ } /* END while (ptr != NULL) */ if (MSched.NodeMemOverCommitFactor > 0.0) @@ -6406,7 +6406,7 @@ for (AP = PJob->attribs;AP != NULL;AP = AP->next) { - if (!strcmp(AP->name,ATTR_queue)) + if (!strcasecmp(AP->name,ATTR_queue)) break; } diff -Naur maui-3.2.6p19/src/moab/MPar.c maui-3.2.6p19-new/src/moab/MPar.c --- maui-3.2.6p19/src/moab/MPar.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MPar.c 2007-01-25 18:01:29.000000000 +0000 @@ -479,7 +479,7 @@ break; } - if (strcmp(P->Name,PName) != 0) + if (strcasecmp(P->Name,PName) != 0) continue; /* partition found */ @@ -553,13 +553,13 @@ return(SUCCESS); } - if (!strcmp(PName,GLOBAL_MPARNAME)) + if (!strcasecmp(PName,GLOBAL_MPARNAME)) { P = &MPar[0]; pindex = 0; } - else if (!strcmp(PName,DEFAULT_MPARNAME)) + else if (!strcasecmp(PName,DEFAULT_MPARNAME)) { P = &MPar[1]; @@ -1128,7 +1128,7 @@ continue; } - if (strcmp(PName,NONE) && strcmp(PName,P->Name)) + if (strcasecmp(PName,NONE) && strcasecmp(PName,P->Name)) continue; switch(rindex) @@ -1403,7 +1403,7 @@ } else { - if ((MUBoolFromString(SVal,TRUE) == FALSE) || !strcmp(SVal,"NONE")) + if ((MUBoolFromString(SVal,TRUE) == FALSE) || !strcasecmp(SVal,"NONE")) P->BFPolicy = bfNONE; } } /* END BLOCK */ @@ -1934,7 +1934,7 @@ if (P == GP) { - if (strcmp(N->Name,"GLOBAL")) + if (strcasecmp(N->Name,"GLOBAL")) { DBG(1,fSTRUCT) DPrint("ERROR: node '%s' is not associated with any partition\n", N->Name); diff -Naur maui-3.2.6p19/src/moab/MPolicy.c maui-3.2.6p19-new/src/moab/MPolicy.c --- maui-3.2.6p19/src/moab/MPolicy.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MPolicy.c 2007-01-25 18:01:29.000000000 +0000 @@ -1500,7 +1500,7 @@ if (R->CL[aindex].Name[0] == '\0') break; - if (strcmp(R->CL[aindex].Name,JobAttrs[(int)R->CL[aindex].Type]) != 0) + if (strcasecmp(R->CL[aindex].Name,JobAttrs[(int)R->CL[aindex].Type]) != 0) continue; if (!memcmp(PAvailable[(int)R->CL[aindex].Type].HLimit,ZList,sizeof(ZList))) diff -Naur maui-3.2.6p19/src/moab/MQOS.c maui-3.2.6p19-new/src/moab/MQOS.c --- maui-3.2.6p19/src/moab/MQOS.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MQOS.c 2007-01-25 18:01:29.000000000 +0000 @@ -178,7 +178,7 @@ break; } - if (strcmp(MQOS[qindex].Name,QName) != 0) + if (strcasecmp(MQOS[qindex].Name,QName) != 0) continue; /* QOS found */ @@ -346,7 +346,7 @@ return(SUCCESS); } - if (!strcmp(Q->Name,QName)) + if (!strcasecmp(Q->Name,QName)) { if (QP != NULL) *QP = Q; diff -Naur maui-3.2.6p19/src/moab/MQueue.c maui-3.2.6p19-new/src/moab/MQueue.c --- maui-3.2.6p19/src/moab/MQueue.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MQueue.c 2007-01-25 18:01:29.000000000 +0000 @@ -1928,7 +1928,7 @@ (1 << mlActive), NULL) == FAILURE) { - if (strcmp(J->ResName,J->R->Name) != 0) + if (strcasecmp(J->ResName,J->R->Name) != 0) MResDestroy(&J->R); if (MSched.Mode != msmTest) @@ -2082,7 +2082,7 @@ DBG(2,fSCHED) DPrint("ALERT: insufficient nodes to run reserved job '%s' (reservation released)\n", J->Name); - if (strcmp(J->ResName,J->R->Name) != 0) + if (strcasecmp(J->ResName,J->R->Name) != 0) MResDestroy(&J->R); if (MSched.Mode != msmTest) diff -Naur maui-3.2.6p19/src/moab/MRM.c maui-3.2.6p19-new/src/moab/MRM.c --- maui-3.2.6p19/src/moab/MRM.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MRM.c 2007-01-25 18:01:29.000000000 +0000 @@ -1978,7 +1978,7 @@ { R = &MRM[rmindex]; - if ((R != NULL) && !strcmp(R->Name,RMName)) + if ((R != NULL) && !strcasecmp(R->Name,RMName)) { /* RM already exists */ @@ -2096,7 +2096,7 @@ break; } - if (strcmp(R->Name,RMName) != 0) + if (strcasecmp(R->Name,RMName) != 0) continue; /* RM found */ @@ -3194,7 +3194,7 @@ strcpy(tmpName,MNodeAdjustName(N->Name,1)); - if (strcmp(N->Name,tmpName) != 0) + if (strcasecmp(N->Name,tmpName) != 0) MUStrDup(&N->FullName,tmpName); if (N->CTime == 0) diff -Naur maui-3.2.6p19/src/moab/MRes.c maui-3.2.6p19-new/src/moab/MRes.c --- maui-3.2.6p19/src/moab/MRes.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MRes.c 2007-01-25 18:01:29.000000000 +0000 @@ -271,7 +271,7 @@ if ((CAName != NULL) && (CAName[0] != '\0') && - strcmp(CAName,NONE)) + strcasecmp(CAName,NONE)) { MAcctAdd(CAName,&R->A); @@ -672,10 +672,10 @@ { memcpy(R->ACL,AVal,sizeof(R->ACL)); } - else if (strcmp((char *)AVal,NONE) != 0) + else if (strcasecmp((char *)AVal,NONE) != 0) { MACLLoadConfigLine(R->ACL,(char *)AVal); - } /* END if (strcmp((char *)AVal,NONE) != 0) */ + } /* END if (strcasecmp((char *)AVal,NONE) != 0) */ break; @@ -683,7 +683,7 @@ if (Format == mdfString) { - if (strcmp((char *)AVal,NONE)) + if (strcasecmp((char *)AVal,NONE)) { if (MAcctAdd((char *)AVal,&R->A) == FAILURE) { @@ -706,7 +706,7 @@ if (Format == mdfString) { - if (strcmp((char *)AVal,NONE)) + if (strcasecmp((char *)AVal,NONE)) { if (MGroupAdd((char *)AVal,&R->G) == FAILURE) { @@ -729,7 +729,7 @@ if (Format == mdfString) { - if (strcmp((char *)AVal,NONE)) + if (strcasecmp((char *)AVal,NONE)) { if (MUserAdd((char *)AVal,&R->U) == FAILURE) { @@ -759,7 +759,7 @@ case mraHostExp: - if ((AVal == NULL) || !strcmp((char *)AVal,NONE)) + if ((AVal == NULL) || !strcasecmp((char *)AVal,NONE)) { MUFree(&R->RegEx); @@ -1586,7 +1586,7 @@ if (R->Name[0] == '\1') continue; - if (!strcmp(ResID,R->Name)) + if (!strcasecmp(ResID,R->Name)) break; } /* END for (rindex) */ @@ -3732,7 +3732,7 @@ if (R->Type == mrtJob) continue; - if ((R->A == NULL) || !strcmp(R->A->Name,NONE)) + if ((R->A == NULL) || !strcasecmp(R->A->Name,NONE)) { continue; } @@ -4255,9 +4255,9 @@ for (aindex = 0;J->RAList[aindex][0] != '\0';aindex++) { - if (!strcmp(J->RAList[aindex],R->Name) || - !strcmp(J->RAList[aindex],ALL) || - (!strcmp(J->RAList[aindex],"[ALLJOB]") && (R->J != NULL))) + if (!strcasecmp(J->RAList[aindex],R->Name) || + !strcasecmp(J->RAList[aindex],ALL) || + (!strcasecmp(J->RAList[aindex],"[ALLJOB]") && (R->J != NULL))) { /* reservation access is granted */ @@ -4275,7 +4275,7 @@ if (!(J->Flags & (1 << mjfResMap))) { - if (!strcmp(R->Name,J->Name)) + if (!strcasecmp(R->Name,J->Name)) { /* job located its own reservation */ @@ -4305,7 +4305,7 @@ { if (R->Type != mrtJob) { - if (strcmp(J->ResName,R->Name) != 0) + if (strcasecmp(J->ResName,R->Name) != 0) { /* reservation is not specifically requested */ @@ -4316,7 +4316,7 @@ } else { - if ((RJ == NULL) || strcmp(J->Name,RJ->Name)) + if ((RJ == NULL) || strcasecmp(J->Name,RJ->Name)) { /* reservation is not specificailly requested */ @@ -4337,7 +4337,7 @@ if ((tail = strrchr(R->Name,'.')) != NULL) { - if (!strncmp(R->Name,J->Name,(tail - R->Name))) + if (!strncasecmp(R->Name,J->Name,(tail - R->Name))) { /* same standing reservation */ @@ -4372,7 +4372,7 @@ /* check 'ResName' specification */ - if ((J->ResName[0] != '\0') && strcmp(R->Name,J->ResName)) + if ((J->ResName[0] != '\0') && strcasecmp(R->Name,J->ResName)) { DBG(8,fSTRUCT) DPrint("INFO: exclusive (not 'ResName' reservation)\n"); @@ -4381,7 +4381,7 @@ if (R->Type == mrtJob) { - if ((RJ->ResName[0] != '\0') && strcmp(J->Name,RJ->ResName)) + if ((RJ->ResName[0] != '\0') && strcasecmp(J->Name,RJ->ResName)) { DBG(8,fSTRUCT) DPrint("INFO: exclusive (not 'ResName' reservation)\n"); @@ -6255,7 +6255,7 @@ if (tmpR->Name[0] == '\1') continue; - if (strncmp(tmpR->Name,tmpName,strlen(tmpName))) + if (strncasecmp(tmpR->Name,tmpName,strlen(tmpName))) continue; tmpI = strtol(&tmpR->Name[strlen(tmpName)],NULL,0); @@ -7099,7 +7099,7 @@ { S = &SRes[srindex]; - if (strncmp(S->Name,R->Name,strlen(S->Name))) + if (strncasecmp(S->Name,R->Name,strlen(S->Name))) continue; for (dindex = 0;dindex < MAX_SRES_DEPTH;dindex++) @@ -7302,7 +7302,7 @@ if ((NameFound == FALSE) && (JName != NULL)) { - if (!strcmp(J->Name,JName)) + if (!strcasecmp(J->Name,JName)) { MTRAPJOB(J,FName); @@ -7843,7 +7843,7 @@ if ((tmpR == NULL) || (tmpR->Name[0] == '\0')) break; - if (!strcmp(R->Name,tmpR->Name)) + if (!strcasecmp(R->Name,tmpR->Name)) { MUSNPrintF(&BPtr,&BSpace,"WARNING: res '%s' (%d) is duplicated at index %d\n", R->Name, diff -Naur maui-3.2.6p19/src/moab/MSR.c maui-3.2.6p19-new/src/moab/MSR.c --- maui-3.2.6p19/src/moab/MSR.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MSR.c 2007-01-25 18:01:29.000000000 +0000 @@ -316,7 +316,7 @@ break; } - if (strcmp(SR->Name,SRName) != 0) + if (strcasecmp(SR->Name,SRName) != 0) continue; /* reservation found */ @@ -365,7 +365,7 @@ { SR = &SRes[srindex]; - if ((SR != NULL) && !strcmp(SR->Name,SRName)) + if ((SR != NULL) && !strcasecmp(SR->Name,SRName)) { /* SR already exists */ @@ -536,7 +536,7 @@ if (SR->PName[0] != '\0') { - if (!strcmp(SR->PName,"ALL")) + if (!strcasecmp(SR->PName,"ALL")) { /* reservation may span */ @@ -545,7 +545,7 @@ } else { - if (strcmp(P->Name,SR->PName)) + if (strcasecmp(P->Name,SR->PName)) continue; } } @@ -557,7 +557,7 @@ continue; } /* END else (SR->PName[0] != '\0') */ - if ((strcmp(SR->PName,"ALL") != 0) && + if ((strcasecmp(SR->PName,"ALL") != 0) && (P->Index == 0)) { continue; @@ -1025,12 +1025,12 @@ { case msraAccess: - if (!strcmp(ValLine,"SHARED")) + if (!strcasecmp(ValLine,"SHARED")) { if (SR->Flags & (1 << mrfDedicatedResource)) SR->Flags ^= (1 << mrfDedicatedResource); } - else if (!strcmp(ValLine,"DEDICATED")) + else if (!strcasecmp(ValLine,"DEDICATED")) { SR->Flags |= (1 << mrfDedicatedResource); } @@ -1158,7 +1158,7 @@ case msraNodeFeatures: - if (!strcmp(ValLine,NONE)) + if (!strcasecmp(ValLine,NONE)) break; ptr2 = MUStrTok(ValLine,"[] \t",&TokPtr2); @@ -1339,7 +1339,7 @@ continue; } - if ((tmpLine[0] == '\0') || !strcmp(tmpLine,NONE)) + if ((tmpLine[0] == '\0') || !strcasecmp(tmpLine,NONE)) { continue; } @@ -1384,7 +1384,7 @@ strcpy(tmpLine,MUMAList(eFeature,SR->FeatureMap,sizeof(SR->FeatureMap))); - if (strcmp(tmpLine,NONE)) + if (strcasecmp(tmpLine,NONE)) { sprintf(SRLine,"%s%s=%s ", SRLine, @@ -2023,7 +2023,7 @@ if (SR->Flags & (1 << mrfByName)) J->SpecFlags |= (1 << mjfByName); - if (!strcmp(SR->PName,"ALL")) + if (!strcasecmp(SR->PName,"ALL")) J->SpecFlags |= (1 << mjfSpan); if (SR->HostExpression[0] != '\0') @@ -2325,7 +2325,7 @@ ProcCount = 0; if ((SR->A != NULL) && - strcmp(SR->A->Name,NONE)) + strcasecmp(SR->A->Name,NONE)) { for (nindex = 0;NodeList[nindex].N != NULL;nindex++) { @@ -2401,7 +2401,7 @@ R->Priority = SR->Priority; - if ((SR->A != NULL) && strcmp(SR->A->Name,NONE)) + if ((SR->A != NULL) && strcasecmp(SR->A->Name,NONE)) { R->A = SR->A; } @@ -2721,7 +2721,7 @@ { case pSRAccess: - if (!strcmp(SVal,"SHARED")) + if (!strcasecmp(SVal,"SHARED")) { if (SR->Flags & (1 << mrfDedicatedResource)) SR->Flags ^= (1 << mrfDedicatedResource); diff -Naur maui-3.2.6p19/src/moab/MSched.c maui-3.2.6p19-new/src/moab/MSched.c --- maui-3.2.6p19/src/moab/MSched.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MSched.c 2007-01-25 18:01:29.000000000 +0000 @@ -2240,7 +2240,7 @@ if (MAList[eFeature][findex][0] == '\0') break; - if (strcmp(MAList[eFeature][findex],SetList[sindex])) + if (strcasecmp(MAList[eFeature][findex],SetList[sindex])) continue; SetIndex[MaxSet] = findex; @@ -3602,7 +3602,7 @@ sprintf(Buffer,"%s%-30s %s\n",Buffer,MParam[pDefaultDomain],S->DefaultDomain); } - if (!strcmp(S->DefaultClassList,DEFAULT_CLASSLIST) || + if (!strcasecmp(S->DefaultClassList,DEFAULT_CLASSLIST) || (VFlag || (PIndex == -1) || (PIndex == pDefaultClassList))) { sprintf(Buffer,"%s%-30s %s\n",Buffer,MParam[pDefaultClassList],S->DefaultClassList); @@ -4330,7 +4330,7 @@ for (cindex = 0;MComp[cindex] != NULL;cindex++) { - if (!strcmp(MComp[cindex],TaskCmp)) + if (!strcasecmp(MComp[cindex],TaskCmp)) { break; } @@ -4547,7 +4547,7 @@ case pCheckPointExpirationTime: - if (!strcmp(SVal,"-1") || + if (!strcasecmp(SVal,"-1") || strstr(SVal,"INFIN") || strstr(SVal,"NONE") || strstr(SVal,"UNLIMITED")) @@ -4717,7 +4717,7 @@ case pJobMaxOverrun: - if (!strcmp(SVal,"-1")) + if (!strcasecmp(SVal,"-1")) S->JobMaxOverrun = -1; else S->JobMaxOverrun = MUTimeFromString(SVal); @@ -4891,7 +4891,7 @@ for (index = 0;SArray[index] != NULL;index++) { - if (!strcmp(SArray[index],ALL)) + if (!strcasecmp(SArray[index],ALL)) { P->ResQOSList[aindex][vindex] = (mqos_t *)MAX_MQOS; @@ -5392,7 +5392,7 @@ exit(1); } - if ((strncmp(HostName,S->ServerHost,strlen(S->ServerHost))) && + if ((strncasecmp(HostName,S->ServerHost,strlen(S->ServerHost))) && (strtol(S->ServerHost,NULL,0) == 0)) { DBG(0,fCONFIG) DPrint("ERROR: server must be started on host '%s' (currently on '%s')\n", @@ -6892,16 +6892,16 @@ MAMSyncAlloc(&MAM[0],&MRM[0]); /* FIXME: include all RM indexes */ } - if (strcmp(OldDay,MSched.Day) != 0) + if (strcasecmp(OldDay,MSched.Day) != 0) { MSRUpdate(NULL); - } /* END if (strcmp(OldDay,MSched.Day)) */ + } /* END if (strcasecmp(OldDay,MSched.Day)) */ else { /* adjust all floating/incomplete reservations */ MSRRefresh(); - } /* END else (strcmp(OldDay,MSched.Day) != 0) */ + } /* END else (strcasecmp(OldDay,MSched.Day) != 0) */ MSched.Reload = FALSE; diff -Naur maui-3.2.6p19/src/moab/MSim.c maui-3.2.6p19-new/src/moab/MSim.c --- maui-3.2.6p19/src/moab/MSim.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MSim.c 2007-01-25 18:01:29.000000000 +0000 @@ -773,7 +773,7 @@ { if ((J->Name[0] == '\0') || (J->Name[0] == '\1') || - !strcmp(J->Name,DEFAULT)) + !strcasecmp(J->Name,DEFAULT)) { continue; } @@ -2061,7 +2061,7 @@ for (index = 0;index < JobCount;index++) { - if (!strcmp(tmpJ.Name,MJobTraceBuffer[index].Name)) + if (!strcasecmp(tmpJ.Name,MJobTraceBuffer[index].Name)) { Found = TRUE; diff -Naur maui-3.2.6p19/src/moab/MSys.c maui-3.2.6p19-new/src/moab/MSys.c --- maui-3.2.6p19/src/moab/MSys.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MSys.c 2007-01-25 18:01:29.000000000 +0000 @@ -1924,7 +1924,7 @@ } if ((MXMLGetAttr(E,"outcome",NULL,tmpLine,0) == FAILURE) || - strcmp(tmpLine,"success")) + strcasecmp(tmpLine,"success")) { DBG(2,fCORE) DPrint("ALERT: EM registration failed '%s'\n", RspPtr); @@ -2284,7 +2284,7 @@ /* FORMAT: DDD ... */ - if (strcmp(MSched.Day,tmpDay) != 0) + if (strcasecmp(MSched.Day,tmpDay) != 0) { /* starting new day */ @@ -2292,7 +2292,7 @@ MULToDString(&MSched.Time)); strcpy(MSched.Day,tmpDay); - } /* END if (strcmp(MSched.Day,tmpDay) != 0) */ + } /* END if (strcasecmp(MSched.Day,tmpDay) != 0) */ } /* END BLOCK */ /* get exact time (update SchedTime, Interval) */ diff -Naur maui-3.2.6p19/src/moab/MTime.c maui-3.2.6p19-new/src/moab/MTime.c --- maui-3.2.6p19/src/moab/MTime.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MTime.c 2007-01-25 18:01:29.000000000 +0000 @@ -165,7 +165,7 @@ /* check 'NOW' keyword */ - if (!strcmp(TimeLine,"NOW")) + if (!strcasecmp(TimeLine,"NOW")) { *EpochTime = (long)Now; @@ -174,7 +174,7 @@ /* check 'OFF' keyword */ - if (!strcmp(TimeLine,"OFF")) + if (!strcasecmp(TimeLine,"OFF")) { *EpochTime = MAX_MTIME; @@ -376,7 +376,7 @@ if (TString == NULL) return(0); - if (!strcmp(TString,"INFINITY")) + if (!strcasecmp(TString,"INFINITY")) return(MAX_MTIME); if (strchr(TString,':') == NULL) diff -Naur maui-3.2.6p19/src/moab/MTrace.c maui-3.2.6p19-new/src/moab/MTrace.c --- maui-3.2.6p19/src/moab/MTrace.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MTrace.c 2007-01-25 18:01:29.000000000 +0000 @@ -239,7 +239,7 @@ /* look for version settings */ - if (!strncmp(Line,TRACE_RESOURCE_VERSION_MARKER,strlen(TRACE_RESOURCE_VERSION_MARKER))) + if (!strncasecmp(Line,TRACE_RESOURCE_VERSION_MARKER,strlen(TRACE_RESOURCE_VERSION_MARKER))) { if (MTraceGetResourceVersion(Line,Version) == FAILURE) { @@ -276,11 +276,11 @@ case 230: default: - if (!strncmp(Line,"COMPUTENODE",strlen("COMPUTENODE"))) + if (!strncasecmp(Line,"COMPUTENODE",strlen("COMPUTENODE"))) RType = mrtComputeNode; - else if (!strncmp(Line,"NETWORK",strlen("NETWORK"))) + else if (!strncasecmp(Line,"NETWORK",strlen("NETWORK"))) RType = mrtNetwork; - else if (!strncmp(Line,"HSM",strlen("HSM"))) + else if (!strncasecmp(Line,"HSM",strlen("HSM"))) RType = mrtHSM; else RType = mrtComputeNode; @@ -764,7 +764,7 @@ N->CRes.Mem = MURSpecToL(tmpMemBuf,mvmMega,mvmMega); N->CRes.Disk = MURSpecToL(tmpDiskBuf,mvmMega,mvmMega); - if (!strcmp(RMName,NONE)) + if (!strcasecmp(RMName,NONE)) MRMAdd(RMName,&N->RM); else MRMAdd(DEFAULT,&N->RM); @@ -867,11 +867,11 @@ } else { - if (!strcmp(EventType,"AVAILABLE")) + if (!strcasecmp(EventType,"AVAILABLE")) N->State = mnsIdle; - else if (!strcmp(EventType,"DEFINED")) + else if (!strcasecmp(EventType,"DEFINED")) N->State = mnsDown; - else if (!strcmp(EventType,"DRAINED")) + else if (!strcasecmp(EventType,"DRAINED")) N->State = mnsDrained; else N->State = mnsNONE; @@ -917,7 +917,7 @@ /* load generic resources */ - if (!strcmp(GResString,NONE) != 0) + if (!strcasecmp(GResString,NONE) != 0) { MUNumListFromString(N->CRes.GRes,GResString,eGRes); } @@ -1079,7 +1079,7 @@ /* look for VERSION settings */ - if (!strncmp(Line,TRACE_WORKLOAD_VERSION_MARKER,strlen(TRACE_WORKLOAD_VERSION_MARKER))) + if (!strncasecmp(Line,TRACE_WORKLOAD_VERSION_MARKER,strlen(TRACE_WORKLOAD_VERSION_MARKER))) { if (MTraceGetWorkloadVersion(Line,Version) == FAILURE) { @@ -1097,7 +1097,7 @@ } return(FAILURE); - } /* END if (!strncmp(Line,TRACE_WORKLOAD_VERSION_MARKER)) */ + } /* END if (!strncasecmp(Line,TRACE_WORKLOAD_VERSION_MARKER)) */ /* set default workload attributes */ @@ -1225,7 +1225,7 @@ ptr = NULL; ptr2 = NULL; - if (strcmp(tmpASString,NONE)) + if (strcasecmp(tmpASString,NONE)) { if ((ptr = MUStrTok(tmpASString,":",&TokPtr)) != NULL) { @@ -1314,7 +1314,7 @@ while (ptr != NULL) { - if (!strncmp(ptr,"JATTR:",strlen("JATTR:"))) + if (!strncasecmp(ptr,"JATTR:",strlen("JATTR:"))) { MJobSetAttr(J,mjaGAttr,(void **)(ptr + strlen("JATTR:")),0,mSet); } @@ -1340,7 +1340,7 @@ /* load task info */ - if (!strncmp(tmpTaskRequest,"PBS=",strlen("PBS="))) + if (!strncasecmp(tmpTaskRequest,"PBS=",strlen("PBS="))) { char tmpLine[MAX_MLINE]; @@ -1442,12 +1442,12 @@ /* determine required reservation */ - if (strcmp(Reservation,NONE) && - strcmp(Reservation,J->Name)) + if (strcasecmp(Reservation,NONE) && + strcasecmp(Reservation,J->Name)) { J->SpecFlags |= (1 << mjfAdvReservation); - if (strcmp(Reservation,ALL) != 0) + if (strcasecmp(Reservation,ALL) != 0) { strcpy(J->ResName,Reservation); } @@ -1484,7 +1484,7 @@ if (Mode != msmProfile) { - if ((strcmp(MReqHList,NONE) != 0) && + if ((strcasecmp(MReqHList,NONE) != 0) && !(MSim.Flags & (1 << msimfIgnHostList)) && !(MSim.Flags & (1 << msimfIgnAll))) { @@ -1569,7 +1569,7 @@ } /* END while (ptr != NULL) */ J->ReqHList[nindex + 1].N = NULL; - } /* END if (strcmp(MReqHList,NONE)) */ + } /* END if (strcasecmp(MReqHList,NONE)) */ else if ((J->SpecFlags & (1 << mjfHostList)) && (J->ReqHList == NULL)) { @@ -1596,13 +1596,13 @@ break; } /* END switch(*Version) */ - if (!strcmp(AName,NONE) || - !strcmp(AName,"0")) + if (!strcasecmp(AName,NONE) || + !strcasecmp(AName,"0")) { AName[0] = '\0'; } - if ((strcmp(tmpRMXString,NONE) != 0) && (strcmp(tmpRMXString,"0") != 0)) + if ((strcasecmp(tmpRMXString,NONE) != 0) && (strcasecmp(tmpRMXString,"0") != 0)) { MJobSetAttr(J,mjaRMXString,(void **)tmpRMXString,mdfString,0); } @@ -1660,7 +1660,7 @@ for (index = 0;MJobState[index] != NULL;index++) { - if (!strcmp(tmpState,MJobState[index])) + if (!strcasecmp(tmpState,MJobState[index])) { J->State = index; J->EState = index; @@ -1841,10 +1841,10 @@ if ((ptr != NULL) && (ptr[0] != '\0') && - strcmp(ptr,"-1") && - strcmp(ptr,"0") && - strcmp(ptr,NONE) && - strcmp(ptr,DEFAULT)) + strcasecmp(ptr,"-1") && + strcasecmp(ptr,"0") && + strcasecmp(ptr,NONE) && + strcasecmp(ptr,DEFAULT)) { if (MQOSAdd(ptr,&J->QReq) == FAILURE) { @@ -1877,7 +1877,7 @@ } } /* END if (Mode == msmSim) */ - if ((SetString[0] != '0') && (strcmp(SetString,NONE))) + if ((SetString[0] != '0') && (strcasecmp(SetString,NONE))) { /* FORMAT: ONEOF,FEATURE[,X:Y:Z] */ @@ -1912,7 +1912,7 @@ RQ[0]->SetList[index] = NULL; } /* END if ((ptr = MUStrTok(NULL)) != NULL) */ } /* END if ((ptr = MUStrTok(SetString)) != NULL) */ - } /* END if ((SetString[0] != '0') && (strcmp(SetString,NONE))) */ + } /* END if ((SetString[0] != '0') && (strcasecmp(SetString,NONE))) */ if (MJobEval(J) == FAILURE) { diff -Naur maui-3.2.6p19/src/moab/MUH.c maui-3.2.6p19-new/src/moab/MUH.c --- maui-3.2.6p19/src/moab/MUH.c 2006-12-01 15:08:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MUH.c 2007-01-25 18:01:29.000000000 +0000 @@ -77,7 +77,7 @@ for (index = 0;MSched.Admin3User[index][0] != '\0';index++) { - if (!strcmp(MSched.Admin3User[index],"ALL")) + if (!strcasecmp(MSched.Admin3User[index],"ALL")) { break; } @@ -119,7 +119,7 @@ sizeof(HTTPProtocol), HTTPProtocol); - if (strcmp(HTTPCommand,"GET")) + if (strcasecmp(HTTPCommand,"GET")) { UHSendFailure(S,"request not supported"); diff -Naur maui-3.2.6p19/src/moab/MUI.c maui-3.2.6p19-new/src/moab/MUI.c --- maui-3.2.6p19/src/moab/MUI.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MUI.c 2007-01-25 18:01:29.000000000 +0000 @@ -212,7 +212,7 @@ while ((ptr = MUStrTok(NULL,"\n",&TokPtr)) != NULL) { - if (!strcmp(ptr,"[ENDACTIVE]")) + if (!strcasecmp(ptr,"[ENDACTIVE]")) break; acount++; @@ -288,7 +288,7 @@ while ((ptr = MUStrTok(NULL,"\n",&TokPtr)) != NULL) { - if (!strcmp(ptr,"[ENDIDLE]")) + if (!strcasecmp(ptr,"[ENDIDLE]")) break; count++; @@ -344,7 +344,7 @@ while ((ptr = MUStrTok(NULL,"\n",&TokPtr)) != NULL) { - if (!strcmp(ptr,"[ENDNOTQUEUED]")) + if (!strcasecmp(ptr,"[ENDNOTQUEUED]")) { break; } @@ -470,7 +470,7 @@ while ((ptr = MUStrTok(NULL,"\n",&TokPtr)) != NULL) { - if (!strcmp(ptr,"[ENDACTIVE]")) + if (!strcasecmp(ptr,"[ENDACTIVE]")) break; if (acount == 0) @@ -553,7 +553,7 @@ while ((ptr = MUStrTok(NULL,"\n",&TokPtr)) != NULL) { - if (!strcmp(ptr,"[ENDIDLE]")) + if (!strcasecmp(ptr,"[ENDIDLE]")) break; if (icount == 0) @@ -617,7 +617,7 @@ while ((ptr = MUStrTok(NULL,"\n",&TokPtr)) != NULL) { - if (!strcmp(ptr,"[ENDNOTQUEUED]")) + if (!strcasecmp(ptr,"[ENDNOTQUEUED]")) { break; } diff -Naur maui-3.2.6p19/src/moab/MUser.c maui-3.2.6p19-new/src/moab/MUser.c --- maui-3.2.6p19/src/moab/MUser.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MUser.c 2007-01-25 18:01:29.000000000 +0000 @@ -274,7 +274,7 @@ if ((U != NULL) && (U->Key == hashkey) && - !strcmp(U->Name,UName)) + !strcasecmp(U->Name,UName)) { if (UP != NULL) *UP = U; @@ -310,7 +310,7 @@ MUStrCpy(U->Name,UName,sizeof(U->Name)); - if (strcmp(UName,ALL) && strcmp(UName,NONE)) + if (strcasecmp(UName,ALL) && strcasecmp(UName,NONE)) { /* update user record */ @@ -374,7 +374,7 @@ continue; } - if (strcmp(U->Name,UName) != 0) + if (strcasecmp(U->Name,UName) != 0) continue; /* user found */ diff -Naur maui-3.2.6p19/src/moab/MUtil.c maui-3.2.6p19-new/src/moab/MUtil.c --- maui-3.2.6p19/src/moab/MUtil.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MUtil.c 2007-01-25 18:01:29.000000000 +0000 @@ -389,7 +389,7 @@ if ((*Dst != NULL) && (Src != NULL) && (Src[0] == (*Dst)[0]) && - (!strcmp(Src,*Dst))) + (!strcasecmp(Src,*Dst))) { /* strings are identical */ @@ -567,7 +567,7 @@ { for (index = 0;MFalseString[index] != NULL;index++) { - if (!strcmp(Value,MFalseString[index])) + if (!strcasecmp(Value,MFalseString[index])) { return(FALSE); } @@ -577,7 +577,7 @@ { for (index = 0;MTrueString[index] != NULL;index++) { - if (!strcmp(Value,MTrueString[index])) + if (!strcasecmp(Value,MTrueString[index])) { return(TRUE); } @@ -620,7 +620,7 @@ { for (index = 0;MClass[index].Name[0] != '\0';index++) { - if (!strcmp(MAList[eClass][cindex],MClass[index].Name)) + if (!strcasecmp(MAList[eClass][cindex],MClass[index].Name)) { *CPrio = MClass[index].F.Priority; @@ -729,7 +729,7 @@ { Len = strlen(MComp[index]); - if (strncmp(Line,MComp[index],Len) != 0) + if (strncasecmp(Line,MComp[index],Len) != 0) continue; if (Len == 2) @@ -783,7 +783,7 @@ for (index = 1;index < MAX_MATTR;index++) { - if (!strcmp(MAList[Attr][index],Value)) + if (!strcasecmp(MAList[Attr][index],Value)) { return(1 << index); } @@ -910,7 +910,7 @@ if (MAList[AttrIndex][index][0] == '\0') break; - if (!strcmp(MAList[AttrIndex][index],AttrValue)) + if (!strcasecmp(MAList[AttrIndex][index],AttrValue)) { if (AttrMap != NULL) AttrMap[index >> MINTLBITS] |= 1 << (index % MINTBITS); @@ -966,7 +966,7 @@ for (index = 1;index < MAX_MATTR;index++) { - if (!strcmp(MAList[AIndex][index],Value)) + if (!strcasecmp(MAList[AIndex][index],Value)) return(index); if (MAList[AIndex][index][0] == '\0') @@ -1277,7 +1277,7 @@ { if (tail != '$') { - if (strncmp(MAList[AttrIndex][index],SearchString,Len)) + if (strncasecmp(MAList[AttrIndex][index],SearchString,Len)) { if (Head != NULL) *Head = &MAList[AttrIndex][index][Len]; @@ -1287,7 +1287,7 @@ } else { - if (strncmp(MAList[AttrIndex][index],SearchString,Len - 1) && + if (strncasecmp(MAList[AttrIndex][index],SearchString,Len - 1) && isdigit(MAList[AttrIndex][index][Len - 1])) { if (Head != NULL) @@ -1524,14 +1524,14 @@ { /* handle 'english' comparisons */ - if (!strncmp(ptr,"eq",2)) + if (!strncasecmp(ptr,"eq",2)) { if (Cmp != NULL) *Cmp = mcmpEQ; ptr += 2; } - else if (!strncmp(ptr,"ne",2)) + else if (!strncasecmp(ptr,"ne",2)) { if (Cmp != NULL) *Cmp = mcmpNE; @@ -2179,7 +2179,7 @@ sptr = StringBuffer; - if (!strncmp(sptr,"IFS-",strlen("IFS-"))) + if (!strncasecmp(sptr,"IFS-",strlen("IFS-"))) { sptr += strlen("IFS-"); @@ -2398,7 +2398,7 @@ if (rxcache[rxindex].Pattern[0] == '\0') break; - if (!strcmp(rxcache[rxindex].Pattern,Pattern)) + if (!strcasecmp(rxcache[rxindex].Pattern,Pattern)) break; } /* END for (rxindex) */ } @@ -2531,11 +2531,11 @@ continue; #ifdef LIBGEN - if (!strcmp(Pattern,"ALL") || + if (!strcasecmp(Pattern,"ALL") || (regex(re,N->Name,NULL) != NULL) || ((N->FullName != NULL) && (regex(re,N->FullName,NULL) != NULL))) #else /* LIBGEN */ - if (!strcmp(Pattern,"ALL") || + if (!strcasecmp(Pattern,"ALL") || !regexec(re,N->Name,0,NULL,0) || ((N->FullName != NULL) && !regexec(re,N->FullName,0,NULL,0))) #endif /* LIBGEN */ @@ -2555,7 +2555,7 @@ N->Name); } } - else if (!strcmp(N->Name,Match)) + else if (!strcasecmp(N->Name,Match)) { List[LIndex++] = index; @@ -2566,7 +2566,7 @@ break; } - } /* END if (!strcmp(Pattern,"ALL") || ...) */ + } /* END if (!strcasecmp(Pattern,"ALL") || ...) */ } /* for (index = 0;index < MAX_MNODE;index++) */ List[LIndex] = -1; @@ -2615,8 +2615,8 @@ DBG(6,fUI) DPrint("INFO: comparing job '%s' against regex\n", J->Name); - if (!strcmp(Pattern,"ALL") || - !strcmp(Pattern,"^(ALL)$") || + if (!strcasecmp(Pattern,"ALL") || + !strcasecmp(Pattern,"^(ALL)$") || #ifdef LIBGEN (regex(re,J->Name,NULL) != NULL)) #else /* LIBGEN */ @@ -2641,7 +2641,7 @@ J->Name); } } - else if (!strcmp(J->Name,Match)) + else if (!strcasecmp(J->Name,Match)) { if (Buffer != NULL) strcpy(Buffer,J->Name); @@ -2650,7 +2650,7 @@ break; } - } /* END if (!strcmp(Pattern,"ALL") || ... */ + } /* END if (!strcasecmp(Pattern,"ALL") || ... */ } /* END for (J) */ List[LIndex] = -1; @@ -2708,9 +2708,9 @@ continue; #ifdef LIBGEN - if (!strcmp(Pattern,"ALL") || (regex(re,R->Name,NULL) != NULL)) + if (!strcasecmp(Pattern,"ALL") || (regex(re,R->Name,NULL) != NULL)) #else /* LIBGEN */ - if (!strcmp(Pattern,"ALL") || !regexec(re,R->Name,0,NULL,0)) + if (!strcasecmp(Pattern,"ALL") || !regexec(re,R->Name,0,NULL,0)) #endif /* LIBGEN */ { if (Match[0] == '\0') @@ -2727,7 +2727,7 @@ R->Name); } } - else if (!strcmp(R->Name,Match)) + else if (!strcasecmp(R->Name,Match)) { if (Buffer != NULL) strcpy(Buffer,R->Name); @@ -2736,7 +2736,7 @@ break; } - } /* END if (!strcmp(Pattern,"ALL") || ... */ + } /* END if (!strcasecmp(Pattern,"ALL") || ... */ } /* END for (index) */ List[LIndex] = -1; @@ -2888,7 +2888,7 @@ tmpMod -= ModVal[Modifier]; - if (!strncmp(ptr,"-1",2)) + if (!strncasecmp(ptr,"-1",2)) { return(-1); } @@ -3006,7 +3006,7 @@ { ptr += strlen("PROCS") + 1; - if (!strcmp(ptr,"ALL") || !strcmp(ptr,ALL)) + if (!strcasecmp(ptr,"ALL") || !strcasecmp(ptr,ALL)) R->Procs = -1; else R->Procs = (int)strtol(ptr,NULL,0); @@ -3015,7 +3015,7 @@ { ptr += strlen(MResourceType[mrProc]) + 1; - if (!strcmp(ptr,"ALL")) + if (!strcasecmp(ptr,"ALL")) R->Procs = -1; else R->Procs = (int)strtol(ptr,NULL,0); @@ -3025,7 +3025,7 @@ { ptr += strlen(MResourceType[mrMem]) + 1; - if (!strcmp(ptr,"ALL")) + if (!strcasecmp(ptr,"ALL")) R->Mem = -1; else R->Mem = (int)MURSpecToL(ptr,mvmMega,mvmMega); @@ -3035,7 +3035,7 @@ { ptr += strlen(MResourceType[mrDisk]) + 1; - if (!strcmp(ptr,"ALL")) + if (!strcasecmp(ptr,"ALL")) R->Disk = -1; else R->Disk = (int)MURSpecToL(ptr,mvmMega,mvmMega); @@ -3045,7 +3045,7 @@ { ptr += strlen(MResourceType[mrSwap]) + 1; - if (!strcmp(ptr,"ALL")) + if (!strcasecmp(ptr,"ALL")) R->Swap = -1; else R->Swap = (int)MURSpecToL(ptr,mvmMega,mvmMega); @@ -3574,7 +3574,7 @@ strcpy(tmpLine,MUGIDToName(GID)); - if (!strcmp(tmpLine,NONE) || !strncmp(tmpLine,"GID",3)) + if (!strcasecmp(tmpLine,NONE) || !strncasecmp(tmpLine,"GID",3)) { return(FAILURE); } @@ -3655,7 +3655,7 @@ FName, Name); - if (!strcmp(Name,NONE)) + if (!strcasecmp(Name,NONE)) { return(-1); } @@ -3666,7 +3666,7 @@ { /* look for UID??? format */ - if (!strncmp(Name,__UTILUIDHEADER,strlen(__UTILUIDHEADER))) + if (!strncasecmp(Name,__UTILUIDHEADER,strlen(__UTILUIDHEADER))) return(atoi(Name + strlen(__UTILUIDHEADER))); return(-1); @@ -3692,7 +3692,7 @@ FName, Name); - if (!strcmp(Name,NONE)) + if (!strcasecmp(Name,NONE)) { return(-1); } @@ -3703,7 +3703,7 @@ { /* look for GID??? format */ - if (!strncmp(Name,"GID",3)) + if (!strncasecmp(Name,"GID",3)) { return(atoi(Name + 3)); } @@ -3776,7 +3776,7 @@ for (p = environ;(c = *p) != NULL;p++) { - if ((strncmp(c,Name,len) == 0) && (c[len] == '=')) + if ((strncasecmp(c,Name,len) == 0) && (c[len] == '=')) { *Offset = p - environ; @@ -3847,7 +3847,7 @@ for (index = 0;EnvVal[index][0][0] != '\0';index++) { - if (!strcmp(Var,EnvVal[index][0])) + if (!strcasecmp(Var,EnvVal[index][0])) { sprintf(EnvVal[index][1],"%s=%s", Var, @@ -5053,7 +5053,7 @@ SPtr = SString; } - if (strncmp(SPtr,"\\START",strlen("\\START"))) + if (strncasecmp(SPtr,"\\START",strlen("\\START"))) { /* string not packed */ diff -Naur maui-3.2.6p19/src/moab/MWikiI.c maui-3.2.6p19-new/src/moab/MWikiI.c --- maui-3.2.6p19/src/moab/MWikiI.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/MWikiI.c 2007-01-25 18:01:29.000000000 +0000 @@ -1240,7 +1240,7 @@ /* MUPurgeEscape(JobAttr); */ - if (!strncmp(JobAttr,"TASKLIST=",strlen("TASKLIST="))) + if (!strncasecmp(JobAttr,"TASKLIST=",strlen("TASKLIST="))) { JobAttr += strlen("TASKLIST="); @@ -1310,7 +1310,7 @@ J->SystemQueueTime = J->SubmitTime; - if ((J->Cred.G == NULL) || !strcmp(J->Cred.G->Name,"NOGROUP")) + if ((J->Cred.G == NULL) || !strcasecmp(J->Cred.G->Name,"NOGROUP")) { int GID; @@ -1320,7 +1320,7 @@ { ptr = MUGIDToName(GID); - if (strncmp(ptr,"GID",strlen("GID"))) + if (strncasecmp(ptr,"GID",strlen("GID"))) { MGroupAdd(ptr,&J->Cred.G); @@ -1444,7 +1444,7 @@ MUPurgeEscape(JobAttr); - if (!strncmp(JobAttr,"TASKLIST=",strlen("TASKLIST="))) + if (!strncasecmp(JobAttr,"TASKLIST=",strlen("TASKLIST="))) { MWikiAttrToTaskList( TaskList, @@ -1646,7 +1646,7 @@ { for (aindex = 0;MWikiNodeAttr[aindex] != NULL;aindex++) { - if (!strncmp(MWikiNodeAttr[aindex],Tok,strlen(MWikiNodeAttr[aindex]))) + if (!strncasecmp(MWikiNodeAttr[aindex],Tok,strlen(MWikiNodeAttr[aindex]))) break; } /* END for (aindex) */ } @@ -1673,7 +1673,7 @@ case mwnaState: - if (!strcmp(Value,"Draining")) + if (!strcasecmp(Value,"Draining")) N->State = MUMAGetIndex(eNodeState,"Drain",mAdd); else N->State = MUMAGetIndex(eNodeState,Value,mAdd); @@ -1823,7 +1823,7 @@ N->CRes.PSlot[0].count = 0; - if (strcmp(Value,NONE)) + if (strcasecmp(Value,NONE)) { int cindex; @@ -1839,7 +1839,7 @@ N->CRes.PSlot[cindex].count, MUCAListToString(N->CRes.PSlot,NULL,NULL)); } - } /* END if (strcmp(Value,NONE)) */ + } /* END if (strcasecmp(Value,NONE)) */ break; @@ -1847,7 +1847,7 @@ N->ARes.PSlot[0].count = 0; - if (strcmp(Value,NONE)) + if (strcasecmp(Value,NONE)) { int cindex; @@ -1863,7 +1863,7 @@ N->ARes.PSlot[cindex].count, MUCAListToString(N->ARes.PSlot,NULL,NULL)); } /* END for (cindex) */ - } /* END if (strcmp(Value,NONE)) */ + } /* END if (strcasecmp(Value,NONE)) */ break; @@ -2021,7 +2021,7 @@ case mwjaState: - if (strcmp(MJobState[J->State],Value)) + if (strcasecmp(MJobState[J->State],Value)) { DBG(1,fWIKI) DPrint("INFO: job '%s' changed states from %s to %s\n", J->Name, @@ -2487,7 +2487,7 @@ while (ptr != NULL) { - if (strcmp(ptr,"FREE")) + if (strcasecmp(ptr,"FREE")) { MUStrCpy(J->RAList[rindex],ptr,sizeof(J->RAList[0])); diff -Naur maui-3.2.6p19/src/moab/Makefile maui-3.2.6p19-new/src/moab/Makefile --- maui-3.2.6p19/src/moab/Makefile 2006-12-01 15:10:06.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/Makefile 2007-01-25 18:49:31.000000000 +0000 @@ -14,7 +14,7 @@ SCHEDIP=-I$(INC) -I$(MSCHED_HOME)/include SHELL =/bin/sh - LP =-L$(LIB) $(SCHEDLP) $(LLLP) $(MXLP) $(REGEXLP) $(PBSLDFLAGS) + LP =-L$(LIB) $(SCHEDLP) $(LLLP) $(MXLP) $(REGEXLP) $(PBSLDFLAGS) $(THREADLIB) IP =$(SCHEDIP) $(LLIP) $(REGEXIP) $(MXIP) $(PBSCFLAGS) INCS =$(INC)moab.h $(INC)msched.h DEFS =-D$(OPSYS) $(LLDEF) $(SDRDEF) $(PBSDEF) $(OSDEF) $(MXDEF) $(REGEXDEF) \ diff -Naur maui-3.2.6p19/src/moab/mauth.c maui-3.2.6p19-new/src/moab/mauth.c --- maui-3.2.6p19/src/moab/mauth.c 2006-12-01 15:10:01.000000000 +0000 +++ maui-3.2.6p19-new/src/moab/mauth.c 2007-01-25 18:01:28.000000000 +0000 @@ -241,7 +241,7 @@ break; } /* END for (i) */ - if (strncmp(passwd_s->pw_name,ptr,i)) + if (strncasecmp(passwd_s->pw_name,ptr,i)) { fprintf(stderr,"ERROR: %s is unauthorized to create a checksum for %s\n", passwd_s->pw_name, diff -Naur maui-3.2.6p19/src/server/LLI.c maui-3.2.6p19-new/src/server/LLI.c --- maui-3.2.6p19/src/server/LLI.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/server/LLI.c 2007-01-25 18:41:53.000000000 +0000 @@ -1086,21 +1086,21 @@ RReqName, RReqValue); - if (!strcmp(RName,"ConsumableCpus")) + if (!strcasecmp(RName,"ConsumableCpus")) { N->CRes.Procs = RCfgValue; if ((N->State == mnsIdle) || (N->State == mnsActive)) N->ARes.Procs = RAvlValue; } - else if (!strcmp(RName,"ConsumableVirtualMemory")) + else if (!strcasecmp(RName,"ConsumableVirtualMemory")) { N->CRes.Swap = RCfgValue; if ((N->State == mnsIdle) || (N->State == mnsActive)) N->ARes.Swap = RAvlValue; } - else if (!strcmp(RName,"ConsumableMemory")) + else if (!strcasecmp(RName,"ConsumableMemory")) { N->CRes.Mem = RCfgValue; @@ -1609,15 +1609,15 @@ ReqValue, J->Name); - if (!strcmp(ReqName,"ConsumableCpus")) + if (!strcasecmp(ReqName,"ConsumableCpus")) { RQ->DRes.Procs = ReqValue; } - else if (!strcmp(ReqName,"ConsumableVirtualMemory")) + else if (!strcasecmp(ReqName,"ConsumableVirtualMemory")) { RQ->DRes.Swap = ReqValue; } - else if (!strcmp(ReqName,"ConsumableMemory")) + else if (!strcasecmp(ReqName,"ConsumableMemory")) { RQ->DRes.Mem = ReqValue; } @@ -2993,15 +2993,15 @@ ReqValue, J->Name); - if (!strcmp(ReqName,"ConsumableCpus")) + if (!strcasecmp(ReqName,"ConsumableCpus")) { J->Req[0]->DRes.Procs = ReqValue; } - else if (!strcmp(ReqName,"ConsumableVirtualMemory")) + else if (!strcasecmp(ReqName,"ConsumableVirtualMemory")) { J->Req[0]->DRes.Swap = ReqValue; } - else if (!strcmp(ReqName,"ConsumableMemory")) + else if (!strcasecmp(ReqName,"ConsumableMemory")) { J->Req[0]->DRes.Mem = ReqValue; } diff -Naur maui-3.2.6p19/src/server/Makefile maui-3.2.6p19-new/src/server/Makefile --- maui-3.2.6p19/src/server/Makefile 2006-12-01 15:10:06.000000000 +0000 +++ maui-3.2.6p19-new/src/server/Makefile 2007-01-25 18:07:16.000000000 +0000 @@ -8,8 +8,8 @@ LIB =$(TOP)/lib # uncomment for THREADs -#THREADDEF =-D__MTHREADS -#THREADLIB =-lpthread +THREADDEF =-D__MTHREADS +THREADLIB =-lpthread SCHEDIP=-I$(INC) -I$(TOP)/include SHELL =/bin/sh diff -Naur maui-3.2.6p19/src/server/OServer.c maui-3.2.6p19-new/src/server/OServer.c --- maui-3.2.6p19/src/server/OServer.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/server/OServer.c 2007-01-25 18:41:53.000000000 +0000 @@ -72,15 +72,15 @@ { act.sa_handler = (void(*)(int))SIG_DFL; } - else if (!strcmp(ptr,"TRAP") || !strcmp(ptr,"trap")) + else if (!strcasecmp(ptr,"TRAP") || !strcasecmp(ptr,"trap")) { act.sa_handler = (void(*)(int))CrashMode; } - else if (!strcmp(ptr,"IGNORE") || !strcmp(ptr,"ignore")) + else if (!strcasecmp(ptr,"IGNORE") || !strcasecmp(ptr,"ignore")) { act.sa_handler = (void(*)(int))SIG_IGN; } - else if (!strcmp(ptr,"DIE") || !strcmp(ptr,"die")) + else if (!strcasecmp(ptr,"DIE") || !strcasecmp(ptr,"die")) { act.sa_handler = (void(*)(int))SIG_DFL; } @@ -108,15 +108,15 @@ { act.sa_handler = (void(*)(int))SIG_DFL; } - else if (!strcmp(ptr,"TRAP") || !strcmp(ptr,"trap")) + else if (!strcasecmp(ptr,"TRAP") || !strcasecmp(ptr,"trap")) { act.sa_handler = (void(*)(int))CrashMode; } - else if (!strcmp(ptr,"IGNORE") || !strcmp(ptr,"ignore")) + else if (!strcasecmp(ptr,"IGNORE") || !strcasecmp(ptr,"ignore")) { act.sa_handler = (void(*)(int))SIG_IGN; } - else if (!strcmp(ptr,"DIE") || !strcmp(ptr,"die")) + else if (!strcasecmp(ptr,"DIE") || !strcasecmp(ptr,"die")) { act.sa_handler = (void(*)(int))SIG_DFL; } diff -Naur maui-3.2.6p19/src/server/OUserI.c maui-3.2.6p19-new/src/server/OUserI.c --- maui-3.2.6p19/src/server/OUserI.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/server/OUserI.c 2007-01-25 18:41:53.000000000 +0000 @@ -303,14 +303,14 @@ if (MSched.AdminHost[index][0] == '\0') break; - if (!strcmp(MSched.AdminHost[index],S->Host)) + if (!strcasecmp(MSched.AdminHost[index],S->Host)) { hostcheck = TRUE; break; } - if (!strcmp(MSched.AdminHost[index],"ALL")) + if (!strcasecmp(MSched.AdminHost[index],"ALL")) { hostcheck = TRUE; @@ -577,7 +577,7 @@ if (!(FLAGS & ((1 << fAdmin1) | (1 << fAdmin2)))) { - if (strcmp(J->Cred.U->Name,Auth) != 0) + if (strcasecmp(J->Cred.U->Name,Auth) != 0) { DBG(2,fUI) DPrint("INFO: user %s is not authorized to set user priority on job %s\n", Auth, @@ -630,7 +630,7 @@ for (sindex = 0;MStatType[sindex] != 0;sindex++) { - if (!strcmp(MStatType[sindex],GStat)) + if (!strcasecmp(MStatType[sindex],GStat)) break; } /* END for (sindex) */ @@ -789,7 +789,7 @@ { for (mindex = 0;MComp[mindex] != NULL;mindex++) { - if (!strcmp(MComp[mindex],MemCmp)) + if (!strcasecmp(MComp[mindex],MemCmp)) break; } @@ -870,9 +870,9 @@ (BFNodeCount >= RequiredNodes) && (BFProcCount >= RequiredProcs)) { - if (strcmp(P->Name,CurrentPName) != 0) + if (strcasecmp(P->Name,CurrentPName) != 0) { - if ((strcmp(CurrentPName,GLOBAL_MPARNAME)) && (index == 0)) + if ((strcasecmp(CurrentPName,GLOBAL_MPARNAME)) && (index == 0)) { sprintf(Buffer,"%sno %s available\n", Buffer, diff -Naur maui-3.2.6p19/src/server/SDR.c maui-3.2.6p19-new/src/server/SDR.c --- maui-3.2.6p19/src/server/SDR.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/server/SDR.c 2007-01-25 18:41:53.000000000 +0000 @@ -325,15 +325,15 @@ DBG(6,fSDR) DPrint("INFO: adaptertype: %s\n", StrFrom(List)); - if (!strcmp(StrFrom(List),"en0")) + if (!strcasecmp(StrFrom(List),"en0")) { AdapterType = mnetEN0; } - else if (!strcmp(StrFrom(List),"en1")) + else if (!strcasecmp(StrFrom(List),"en1")) { AdapterType = mnetEN1; } - else if (!strcmp(StrFrom(List),"css0")) + else if (!strcasecmp(StrFrom(List),"css0")) { AdapterType = mnetCSS0; } diff -Naur maui-3.2.6p19/src/server/Server.c maui-3.2.6p19-new/src/server/Server.c --- maui-3.2.6p19/src/server/Server.c 2006-12-01 15:10:03.000000000 +0000 +++ maui-3.2.6p19-new/src/server/Server.c 2007-01-25 18:41:53.000000000 +0000 @@ -423,8 +423,8 @@ for (index = 0;MSched.Admin1User[index][0] != '\0';index++) { - if (!strcmp(MSched.Admin1User[index],name) || - !strcmp(MSched.Admin1User[index],"ALL")) + if (!strcasecmp(MSched.Admin1User[index],name) || + !strcasecmp(MSched.Admin1User[index],"ALL")) { tmpL |= (1 << fAdmin1); @@ -434,8 +434,8 @@ for (index = 0;MSched.Admin2User[index][0] != '\0';index++) { - if (!strcmp(MSched.Admin2User[index],name) || - !strcmp(MSched.Admin2User[index],"ALL")) + if (!strcasecmp(MSched.Admin2User[index],name) || + !strcasecmp(MSched.Admin2User[index],"ALL")) { tmpL |= (1 << fAdmin2); @@ -445,8 +445,8 @@ for (index = 0;MSched.Admin3User[index][0] != '\0';index++) { - if (!strcmp(MSched.Admin3User[index],name) || - !strcmp(MSched.Admin3User[index],"ALL")) + if (!strcasecmp(MSched.Admin3User[index],name) || + !strcasecmp(MSched.Admin3User[index],"ALL")) { tmpL |= (1 << fAdmin3); @@ -678,7 +678,7 @@ Value = MUStrTok(NULL,"=",&TokPtr); } - if (!strcmp(OptArg,"about")) + if (!strcasecmp(OptArg,"about")) { mccfg_t C; @@ -728,7 +728,7 @@ exit(0); } - else if ((!strcmp(OptArg,"configfile")) && (Value != NULL)) + else if ((!strcasecmp(OptArg,"configfile")) && (Value != NULL)) { MUStrCpy(MSched.ConfigFile,Value,sizeof(MSched.ConfigFile)); @@ -737,13 +737,13 @@ MSched.SecureMode = FALSE; } - else if (!strcmp(OptArg,"help")) + else if (!strcasecmp(OptArg,"help")) { ServerShowUsage(ArgV[0]); exit(0); } - else if (!strcmp(OptArg,"keyfile")) + else if (!strcasecmp(OptArg,"keyfile")) { FILE *fp; char tmpS[MAX_MLINE]; @@ -772,7 +772,7 @@ fclose(fp); } - else if ((!strcmp(OptArg,"loglevel")) && (Value != NULL)) + else if ((!strcasecmp(OptArg,"loglevel")) && (Value != NULL)) { mlog.Threshold = (int)strtol(Value,NULL,0); @@ -781,21 +781,21 @@ break; } - else if ((!strcmp(OptArg,"host")) && (Value != NULL)) + else if ((!strcasecmp(OptArg,"host")) && (Value != NULL)) { MUStrCpy(MSched.ServerHost,Value,sizeof(MSched.ServerHost)); DBG(3,fCONFIG) DPrint("INFO: server host set to %s\n", MSched.ServerHost); } - else if ((!strcmp(OptArg,"port")) && (Value != NULL)) + else if ((!strcasecmp(OptArg,"port")) && (Value != NULL)) { MSched.ServerPort = (int)strtol(Value,NULL,0); DBG(3,fCONFIG) DPrint("INFO: server port set to %d\n", MSched.ServerPort); } - else if (!strcmp(OptArg,"version")) + else if (!strcasecmp(OptArg,"version")) { fprintf(stderr,"%s version %s\n", MSCHED_NAME, @@ -1157,17 +1157,17 @@ { /* use default signal handling */ } - else if (!strcmp(ptr,"TRAP") || !strcmp(ptr,"trap")) + else if (!strcasecmp(ptr,"TRAP") || !strcasecmp(ptr,"trap")) { signal(SIGSEGV, (void(*)(int))CrashMode); signal(SIGILL, (void(*)(int))CrashMode); } - else if (!strcmp(ptr,"IGNORE") || !strcmp(ptr,"ignore")) + else if (!strcasecmp(ptr,"IGNORE") || !strcasecmp(ptr,"ignore")) { signal(SIGSEGV, (void(*)(int))SIG_IGN); signal(SIGILL, (void(*)(int))SIG_IGN); } - else if (!strcmp(ptr,"DIE") || !strcmp(ptr,"die")) + else if (!strcasecmp(ptr,"DIE") || !strcasecmp(ptr,"die")) { signal(SIGSEGV, (void(*)(int))SIG_DFL); signal(SIGILL, (void(*)(int))SIG_DFL); @@ -1206,7 +1206,7 @@ /* handle 'pre scheduling' tasks */ - if (strcmp(MSched.Day,OldDay)) + if (strcasecmp(MSched.Day,OldDay)) { /* starting new day */ @@ -1220,7 +1220,7 @@ TRACE_WORKLOAD_VERSION_MARKER, DEFAULT_WORKLOAD_TRACE_VERSION); } - } /* END if (strcmp(MSched.Day,ptr)) */ + } /* END if (strcasecmp(MSched.Day,ptr)) */ return(SUCCESS); } /* END ServerUpdate() */ @@ -1420,7 +1420,7 @@ for (index = 0;MSched.Admin1User[index][0] != '\0';index++) { - if (!strcmp(MSched.Admin1User[index],MUUIDToName(uid))) + if (!strcasecmp(MSched.Admin1User[index],MUUIDToName(uid))) { ValidAdmin = TRUE; diff -Naur maui-3.2.6p19/src/server/UserI.c maui-3.2.6p19-new/src/server/UserI.c --- maui-3.2.6p19/src/server/UserI.c 2006-12-01 15:10:03.000000000 +0000 +++ maui-3.2.6p19-new/src/server/UserI.c 2007-01-25 18:41:53.000000000 +0000 @@ -592,14 +592,14 @@ if ((U == NULL) || (U->Name[0] == '\0') || (U->Name[0] == '\1')) continue; - if (!strcmp(U->Name,ALL)) + if (!strcasecmp(U->Name,ALL)) continue; DBG(8,fUI) DPrint("INFO: checking User[%04d]: %s\n", uindex, U->Name); - if ((UName != NULL) && strcmp(UName,NONE) && strcmp(UName,U->Name)) + if ((UName != NULL) && strcasecmp(UName,NONE) && strcasecmp(UName,U->Name)) continue; MUStrCat( @@ -650,14 +650,14 @@ if ((G == NULL) || (G->Name[0] == '\0') || (G->Name[0] == '\1')) continue; - if (!strcmp(G->Name,ALL) || !strcmp(G->Name,"NOGROUP")) + if (!strcasecmp(G->Name,ALL) || !strcasecmp(G->Name,"NOGROUP")) continue; DBG(8,fUI) DPrint("INFO: checking Group[%04d]: %s\n", gindex, G->Name); - if ((GName != NULL) && strcmp(GName,NONE) && strcmp(GName,G->Name)) + if ((GName != NULL) && strcasecmp(GName,NONE) && strcasecmp(GName,G->Name)) continue; MUStrCat( @@ -708,14 +708,14 @@ if ((A == NULL) || (A->Name[0] == '\0') || (A->Name[0] == '\1')) continue; - if (!strcmp(A->Name,ALL)) + if (!strcasecmp(A->Name,ALL)) continue; DBG(8,fUI) DPrint("INFO: checking Acct[%04d]: %s\n", aindex, A->Name); - if ((AName != NULL) && strcmp(AName,NONE) && strcmp(AName,A->Name)) + if ((AName != NULL) && strcasecmp(AName,NONE) && strcasecmp(AName,A->Name)) continue; MUStrCat( @@ -822,7 +822,7 @@ if (!(AFlags & ((1 << fAdmin1) | (1 << fAdmin2) | (1 << fAdmin3)))) { - if (strcmp(J->Cred.U->Name,Auth) != 0) + if (strcasecmp(J->Cred.U->Name,Auth) != 0) { DBG(2,fUI) DPrint("INFO: user %s is not authorized to check status of job '%s'\n", Auth, @@ -909,7 +909,7 @@ if ((Flags & (1 << mcmVerbose)) && (J->RMJID != NULL) && - (strcmp(J->Name,J->RMJID))) + (strcasecmp(J->Name,J->RMJID))) { MUSNPrintF(&BPtr,&BSpace,"checking job %s (RM job '%s')\n\n", J->Name, @@ -1097,7 +1097,7 @@ ptr = MUMAList(eFeature,RQ->PrefFBM,sizeof(RQ->PrefFBM)); - if (strcmp(ptr,NONE) != 0) + if (strcasecmp(ptr,NONE) != 0) { MUSNPrintF(&BPtr,&BSpace,"Preferences: %s\n", ptr); @@ -1106,7 +1106,7 @@ if (Flags & (1 << mcmVerbose)) { MUSNPrintF(&BPtr,&BSpace,"Exec: '%s' ExecSize: %d ImageSize: %d\n", - ((J->E.Cmd != NULL) && strcmp(J->E.Cmd,NONE)) ? J->E.Cmd : "", + ((J->E.Cmd != NULL) && strcasecmp(J->E.Cmd,NONE)) ? J->E.Cmd : "", J->ExecSize, J->ImageSize); } @@ -1470,7 +1470,7 @@ /* evaluate reservation access */ - if (strcmp(ResList,NONE) && (ResList[0] != '\0')) + if (strcasecmp(ResList,NONE) && (ResList[0] != '\0')) { char *ptr; char *TokPtr; @@ -1506,7 +1506,7 @@ RName); } } - } /* END if (strcmp(ResList,NONE) && (ResList[0] != '\0')) */ + } /* END if (strcasecmp(ResList,NONE) && (ResList[0] != '\0')) */ /* display defer info/state discrepancies */ @@ -1868,8 +1868,8 @@ continue; if ((NodeName[0] != '\0') && - strcmp(NodeName,NONE) && - strcmp(NodeName,N->Name)) + strcasecmp(NodeName,NONE) && + strcasecmp(NodeName,N->Name)) { continue; } @@ -2182,7 +2182,7 @@ if (!(CFlags & ((1 << fAdmin1) | (1 << fAdmin2)))) { - if (strcmp(J->Cred.U->Name,Auth)) + if (strcasecmp(J->Cred.U->Name,Auth)) { DBG(2,fUI) DPrint("INFO: user %s is not authorized to perform operation on job %s\n", Auth, @@ -2554,7 +2554,7 @@ if (!(CFlags & ((1 << fAdmin1) | (1 << fAdmin2)))) { - if ((R->U != NULL) && strcmp(R->U->Name,Auth)) + if ((R->U != NULL) && strcasecmp(R->U->Name,Auth)) { DBG(2,fUI) DPrint("INFO: user %s is not authorized to perform operation on res %s\n", Auth, @@ -2885,7 +2885,7 @@ if (SRes[srindex].Name[0] == '\0') continue; - if (!strcmp(SRes[srindex].Name,ResID)) + if (!strcasecmp(SRes[srindex].Name,ResID)) break; } /* END for (srindex) */ @@ -2909,9 +2909,9 @@ while (ptr != NULL) { - if (!strncmp(ptr,"MAXTIME=",strlen("MAXTIME="))) + if (!strncasecmp(ptr,"MAXTIME=",strlen("MAXTIME="))) { - if (!strcmp(ptr + strlen("MAXTIME="),"DEFAULT")) + if (!strcasecmp(ptr + strlen("MAXTIME="),"DEFAULT")) { MACLClear(SR->ACL,maDuration); @@ -2938,9 +2938,9 @@ MaxTime); } } - else if (!strncmp(ptr,"DAYS=",strlen("DAYS="))) + else if (!strncasecmp(ptr,"DAYS=",strlen("DAYS="))) { - if (!strcmp(ptr + strlen("DAYS="),"DEFAULT")) + if (!strcasecmp(ptr + strlen("DAYS="),"DEFAULT")) { SR->Days = 0; @@ -2968,9 +2968,9 @@ ptr + strlen("DAYS=")); } } - else if (!strncmp(ptr,"STARTTIME=",strlen("STARTTIME="))) + else if (!strncasecmp(ptr,"STARTTIME=",strlen("STARTTIME="))) { - if (!strcmp(ptr + strlen("STARTTIME="),"DEFAULT")) + if (!strcasecmp(ptr + strlen("STARTTIME="),"DEFAULT")) { SR->StartTime = 0; @@ -2986,9 +2986,9 @@ MULToTString(SR->StartTime)); } } - else if (!strncmp(ptr,"ENDTIME=",strlen("ENDTIME="))) + else if (!strncasecmp(ptr,"ENDTIME=",strlen("ENDTIME="))) { - if (!strcmp(ptr + strlen("ENDTIME="),"DEFAULT")) + if (!strcasecmp(ptr + strlen("ENDTIME="),"DEFAULT")) { SR->EndTime = 0; @@ -3004,9 +3004,9 @@ MULToTString(SR->EndTime)); } } - else if (!strncmp(ptr,"TASKCOUNT=",strlen("TASKCOUNT="))) + else if (!strncasecmp(ptr,"TASKCOUNT=",strlen("TASKCOUNT="))) { - if (!strcmp(ptr + strlen("TASKCOUNT="),"DEFAULT")) + if (!strcasecmp(ptr + strlen("TASKCOUNT="),"DEFAULT")) { SR->TaskCount = 0; @@ -3022,7 +3022,7 @@ SR->TaskCount); } } - else if (!strncmp(ptr,"CHARGEACCOUNT=",strlen("CHARGEACCOUNT="))) + else if (!strncasecmp(ptr,"CHARGEACCOUNT=",strlen("CHARGEACCOUNT="))) { /* flush existing charges */ @@ -3049,7 +3049,7 @@ } } - if (!strcmp(ptr + strlen("CHARGEACCOUNT="),"DEFAULT")) + if (!strcasecmp(ptr + strlen("CHARGEACCOUNT="),"DEFAULT")) { SR->A = NULL; @@ -4334,7 +4334,7 @@ PIndex = MUGetIndex(tmpParameter,(const char **)MParam,FALSE,-1); - if (!strcmp(ConfigMode,"VERBOSE")) + if (!strcasecmp(ConfigMode,"VERBOSE")) Vflag = 1; else Vflag = 0; @@ -4380,7 +4380,7 @@ CName, MXO[CIndex]); - if ((CName == NULL) || strcmp(CName,NONE)) + if ((CName == NULL) || strcasecmp(CName,NONE)) { /* if CName specified */ @@ -4410,9 +4410,9 @@ while ((O = MOGetNextObject(&OP,CIndex,OS,OE,&NameP)) != NULL) { - if ((CName != NULL) && strcmp(CName,NONE)) + if ((CName != NULL) && strcasecmp(CName,NONE)) { - if (strcmp(CName,NameP)) + if (strcasecmp(CName,NameP)) continue; } @@ -4867,11 +4867,11 @@ ForceLevel = 0; - if (!strcmp(tmp,MClientMode[mcmClear])) + if (!strcasecmp(tmp,MClientMode[mcmClear])) { /* clear host info */ - if (!strcmp(SpecNodeList,NONE)) + if (!strcasecmp(SpecNodeList,NONE)) { sprintf(SpecNodeList,"%d", J->Request.TC); @@ -4906,18 +4906,18 @@ return(SUCCESS); } } - else if (!strcmp(tmp,MClientMode[mcmBlock])) + else if (!strcasecmp(tmp,MClientMode[mcmBlock])) { MUIJobPreempt(J,NULL,Auth,-1,Buffer); return(SUCCESS); } - if (!strcmp(tmp,MClientMode[mcmForce])) + if (!strcasecmp(tmp,MClientMode[mcmForce])) { ForceLevel = 1; } - else if (!strcmp(tmp,MClientMode[mcmForce2])) + else if (!strcasecmp(tmp,MClientMode[mcmForce2])) { ForceLevel = 2; } @@ -4954,7 +4954,7 @@ /* check proc count */ - if ((ForceLevel < 2) || !strcmp(SpecNodeList,NONE)) + if ((ForceLevel < 2) || !strcasecmp(SpecNodeList,NONE)) { if (RQ->DRes.Procs * J->Request.TC > MPar[0].ARes.Procs) { @@ -4988,7 +4988,7 @@ } } - if (!strcmp(SpecNodeList,NONE)) + if (!strcasecmp(SpecNodeList,NONE)) { /* check node requirements */ @@ -5156,7 +5156,7 @@ } MNodeList[0][nodeindex].N = NULL; - } /* END else (strcmp(SpecNodeList,NONE)) */ + } /* END else (strcasecmp(SpecNodeList,NONE)) */ if (MJobAllocMNL( J, @@ -5324,7 +5324,7 @@ return(FAILURE); } - if (!strcmp(J->Cred.U->Name,AName)) + if (!strcasecmp(J->Cred.U->Name,AName)) { JobOwner = TRUE; } @@ -6030,7 +6030,7 @@ /* FORMAT: [<@] */ - if ((ptr[0] != '\0') && strcmp(ptr,NONE)) + if ((ptr[0] != '\0') && strcasecmp(ptr,NONE)) { char *TokPtr; char *ptr2; @@ -6476,7 +6476,7 @@ memset(&tmpRQ.DRes,0,sizeof(tmpRQ.DRes)); - if (!strcmp(ResourceList,NONE)) + if (!strcasecmp(ResourceList,NONE)) { tmpRQ.DRes.Procs = -1; tmpRQ.DRes.Mem = 0; @@ -6486,11 +6486,11 @@ else { MUCResFromString(&tmpRQ.DRes,ResourceList); - } /* else (!strcmp(ResourceList,NONE)) */ + } /* else (!strcasecmp(ResourceList,NONE)) */ /* process feature list */ - if (strcmp(FeatureList,NONE) != 0) + if (strcasecmp(FeatureList,NONE) != 0) { if (strchr(FeatureList,'|')) tmpRQ.ReqFMode = tlOR; @@ -6511,7 +6511,7 @@ /* process node set list */ - if (strcmp(NodeSetString,NONE) != 0) + if (strcasecmp(NodeSetString,NONE) != 0) { /* FORMAT: :[:] */ @@ -6547,13 +6547,13 @@ return(FAILURE); } - } /* END if (strcmp(NodeSetString,NONE) != 0) */ + } /* END if (strcasecmp(NodeSetString,NONE) != 0) */ /* set flags */ Flags = 0; - if (!strcmp(FlagString,NONE)) + if (!strcasecmp(FlagString,NONE)) { MUBMFromString(FlagString,MResFlags,&Flags); } @@ -6679,7 +6679,7 @@ * is used, we replace the Pattern with the resulting nodelist. * This ensures the reservation is checkpointed properly */ - if ((strcmp(FeatureList,NONE) != 0) && (strstr(Pattern,"TASKS") == NULL)) + if ((strcasecmp(FeatureList,NONE) != 0) && (strstr(Pattern,"TASKS") == NULL)) { PatPtr = Pattern; PatSize = sizeof(Pattern); @@ -6725,49 +6725,49 @@ memset(ACL,0,sizeof(ACL)); - if (strcmp(UserList,NONE) != 0) + if (strcasecmp(UserList,NONE) != 0) { ACLList[0] = UserList; MACLLoadConfig(ACL,ACLList,1,maUser); } - if (strcmp(GroupList,NONE) != 0) + if (strcasecmp(GroupList,NONE) != 0) { ACLList[0] = GroupList; MACLLoadConfig(ACL,ACLList,1,maGroup); } - if (strcmp(AccountList,NONE) != 0) + if (strcasecmp(AccountList,NONE) != 0) { ACLList[0] = AccountList; MACLLoadConfig(ACL,ACLList,1,maAcct); } - if (strcmp(QOSList,NONE) != 0) + if (strcasecmp(QOSList,NONE) != 0) { ACLList[0] = QOSList; MACLLoadConfig(ACL,ACLList,1,maQOS); } - if (strcmp(ClassList,NONE) != 0) + if (strcasecmp(ClassList,NONE) != 0) { ACLList[0] = ClassList; MACLLoadConfig(ACL,ACLList,1,maClass); } - if (strcmp(JobFeatureList,NONE) != 0) + if (strcasecmp(JobFeatureList,NONE) != 0) { ACLList[0] = JobFeatureList; MACLLoadConfig(ACL,ACLList,1,maJFeature); } - if (strcmp(ResID,NONE)) + if (strcasecmp(ResID,NONE)) { strcpy(Name,ResID); } @@ -6788,7 +6788,7 @@ if ((FLAGS & ((1 << fAdmin1) | (1 << fAdmin2)))) { - if (strcmp(ChargeSpec,NONE)) + if (strcasecmp(ChargeSpec,NONE)) { /* FORMAT: ACCOUNT[,GROUP[,USER]] */ @@ -6812,7 +6812,7 @@ { MUserAdd(ptr,&U); } - } /* END if (strcmp(ChargeSpec,NONE)) */ + } /* END if (strcasecmp(ChargeSpec,NONE)) */ } /* END if ((FLAGS & ((1 << fAdmin1) | (1 << fAdmin2)))) */ else { @@ -7491,7 +7491,7 @@ /* HvB */ - if ((UName[0] != '\0') && strcmp(J->Cred.U->Name,UName)) + if ((UName[0] != '\0') && strcasecmp(J->Cred.U->Name,UName)) continue; RQ = J->Req[0]; /* handle only first req of job */ @@ -7570,7 +7570,7 @@ if ((J->State == mjsRemoved) || (J->State == mjsSuspended)) continue; - if ((UName[0] != '\0') && strcmp(J->Cred.U->Name,UName)) + if ((UName[0] != '\0') && strcasecmp(J->Cred.U->Name,UName)) continue; if (J->Hold & (1 << mhBatch)) @@ -7643,7 +7643,7 @@ continue; } - if ((UName[0] != '\0') && strcmp(J->Cred.U->Name,UName)) + if ((UName[0] != '\0') && strcasecmp(J->Cred.U->Name,UName)) continue; IdleJob = FALSE; @@ -7932,7 +7932,7 @@ J = MJob[jindex]; - if (strcmp(DiagOpt,NONE) && strcmp(DiagOpt,J->Name)) + if (strcasecmp(DiagOpt,NONE) && strcasecmp(DiagOpt,J->Name)) continue; RQ = J->Req[0]; /* FIXME */ @@ -8177,7 +8177,7 @@ } } /* END for jindex */ - if (!strcmp(DiagOpt,NONE)) + if (!strcasecmp(DiagOpt,NONE)) { /* diagnose linked list consistency */ @@ -8346,7 +8346,7 @@ } /* verify reservations ??? */ - } /* END if (!strcmp(DiagOpt,NONE)) */ + } /* END if (!strcasecmp(DiagOpt,NONE)) */ return(SUCCESS); } /* END MUIJobDiagnose() */ @@ -8404,7 +8404,7 @@ NodeName, &Flags); - if (!strcmp(NodeName,"DEFAULT")) + if (!strcasecmp(NodeName,"DEFAULT")) { N = &MSched.DefaultN; } @@ -8505,7 +8505,7 @@ if (!(FLAGS & ((1 << fAdmin1) | (1 << fAdmin2)))) { - if (strcmp(J->Cred.U->Name,Auth) != 0) + if (strcasecmp(J->Cred.U->Name,Auth) != 0) { DBG(2,fUI) DPrint("INFO: user %s is not authorized to cancel job '%s'\n", Auth, @@ -8681,7 +8681,7 @@ if (N == GN) continue; - if (strcmp(DiagOpt,NONE) && strcmp(DiagOpt,N->Name)) + if (strcasecmp(DiagOpt,NONE) && strcasecmp(DiagOpt,N->Name)) continue; if ((PIndex != 0) && (PIndex != N->PtIndex)) @@ -8929,7 +8929,7 @@ /* check network adapters */ - if (strcmp(MAList[eArch][N->Arch],"RS6000") == 0) + if (strcasecmp(MAList[eArch][N->Arch],"RS6000") == 0) { if (!(N->Network & MUMAGetBM(eNetwork,"ethernet",mVerify)) && (N->State != mnsDown)) { @@ -8954,7 +8954,7 @@ MUSNPrintF(&BPtr,&BSpace,"WARNING: node '%s' is not busy and is missing user switch adapter (check switch/runaway processes?)\n", N->Name); } - } /* END if (strcmp(MAList[eArch][N->Arch],"RS6000") == 0) */ + } /* END if (strcasecmp(MAList[eArch][N->Arch],"RS6000") == 0) */ /* check reservations */ @@ -9101,7 +9101,7 @@ if (F == NULL) continue; - if (strcmp(DiagOpt,NONE) && strcmp(DiagOpt,MPar[0].XRes[nindex].Name)) + if (strcasecmp(DiagOpt,NONE) && strcasecmp(DiagOpt,MPar[0].XRes[nindex].Name)) continue; (*F)(&D,mascShow,NULL,(void **)tmpBuffer); @@ -9286,7 +9286,7 @@ if ((PIndex > 0) && (MUBMCheck(PIndex,J->PAL) == FAILURE)) continue; - if ((RID != NULL) && strcmp(RID,NONE) && strcmp(RID,J->Name)) + if ((RID != NULL) && strcasecmp(RID,NONE) && strcasecmp(RID,J->Name)) continue; R = J->R; @@ -9349,7 +9349,7 @@ if (R->Type == mrtJob) continue; - if ((RID != NULL) && strcmp(RID,NONE) && strcmp(RID,R->Name)) + if ((RID != NULL) && strcasecmp(RID,NONE) && strcasecmp(RID,R->Name)) continue; /* security check */ @@ -9360,7 +9360,7 @@ { Access = TRUE; } - else if ((R->U != NULL) && !strcmp(R->U->Name,Auth)) + else if ((R->U != NULL) && !strcasecmp(R->U->Name,Auth)) { Access = TRUE; } @@ -9368,7 +9368,7 @@ { for (aindex = 0;R->ACL[aindex].Name[0] != '\0';aindex++) { - if ((R->ACL[aindex].Type == maUser) && !strcmp(R->ACL[aindex].Name,Auth)) + if ((R->ACL[aindex].Type == maUser) && !strcasecmp(R->ACL[aindex].Name,Auth)) { Access = TRUE; @@ -9702,7 +9702,7 @@ { Access = TRUE; } - else if ((R->U != NULL) && !strcmp(R->U->Name,Auth)) + else if ((R->U != NULL) && !strcasecmp(R->U->Name,Auth)) { Access = TRUE; } @@ -9710,7 +9710,7 @@ { for (aindex = 0;R->ACL[aindex].Name[0] != '\0';aindex++) { - if ((R->ACL[aindex].Type == maUser) && !strcmp(R->ACL[aindex].Name,Auth)) + if ((R->ACL[aindex].Type == maUser) && !strcasecmp(R->ACL[aindex].Name,Auth)) { Access = TRUE; @@ -9816,7 +9816,7 @@ if ((J->State == mjsStarting) || (J->State == mjsRunning)) continue; - if ((UName[0] != '\0') && strcmp(J->Cred.U->Name,UName)) + if ((UName[0] != '\0') && strcasecmp(J->Cred.U->Name,UName)) continue; RQ = J->Req[0]; /* FIXME */ @@ -9957,7 +9957,7 @@ continue; } - if ((UName[0] != '\0') && strcmp(J->Cred.U->Name,UName)) + if ((UName[0] != '\0') && strcasecmp(J->Cred.U->Name,UName)) continue; DBG(9,fUI) DPrint("INFO: Block Reason job %s : %d, %d\n", @@ -10113,7 +10113,7 @@ if (J->MasterJobName != NULL) continue; - if ((UName[0] != '\0') && strcmp(J->Cred.U->Name,UName)) + if ((UName[0] != '\0') && strcasecmp(J->Cred.U->Name,UName)) continue; for (nindex = 0;J->NodeList[nindex].N != NULL;nindex++); @@ -10238,7 +10238,7 @@ if ((PIndex > 0) && (PIndex != R->PtIndex)) continue; - if (strcmp(DiagOpt,NONE) && strcmp(DiagOpt,R->Name)) + if (strcasecmp(DiagOpt,NONE) && strcasecmp(DiagOpt,R->Name)) continue; /* look for isolated reservations (reservation table corruption) */ @@ -10297,7 +10297,7 @@ } } /* END for (rindex) */ - if (!strcmp(DiagOpt,NONE)) + if (!strcasecmp(DiagOpt,NONE)) { sprintf(SBuffer,"%s\nActive Reserved Processors: %d\n", SBuffer, @@ -10319,7 +10319,7 @@ } MResDiagGrid(SBuffer,(int)*SBufSize,0); - } /* END if (!strcmp(DiagOpt,NONE) */ + } /* END if (!strcasecmp(DiagOpt,NONE) */ return(SUCCESS); } /* END UIResDiagnose() */ diff -Naur maui-3.2.6p19/src/server/mclient.c maui-3.2.6p19-new/src/server/mclient.c --- maui-3.2.6p19/src/server/mclient.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/server/mclient.c 2007-01-25 18:41:53.000000000 +0000 @@ -2293,7 +2293,7 @@ (int)(30 - strlen(QType)), "----------------------------"); - if (!strcmp(QType,"active")) + if (!strcasecmp(QType,"active")) { fprintf(stdout,"%-18s %8s %10s %5s %11s %20s\n\n", "JOBNAME", @@ -2354,7 +2354,7 @@ JCount++; QJCount++; - if (!strcmp(QType,"active")) + if (!strcasecmp(QType,"active")) { fprintf(stdout,"%-18s %8s %10s %5d %11s %19s", JID, @@ -2383,7 +2383,7 @@ QType, (QJCount == 1) ? ' ' : 's'); - if (!strcmp(QType,"active")) + if (!strcasecmp(QType,"active")) { fprintf(stdout,"\n%21s %4d of %4d Processors Active (%.2f%c)\n", tmpString, @@ -2970,9 +2970,9 @@ } else { - if (!strcmp(tmpLine,"mdiag")) + if (!strcasecmp(tmpLine,"mdiag")) *CIndex = svcDiagnose; - else if (!strcmp(tmpLine,"mstat")) + else if (!strcasecmp(tmpLine,"mstat")) *CIndex = svcShowStats; else *CIndex = MUGetIndex(tmpLine,MService,FALSE,0); @@ -3074,7 +3074,7 @@ Value = MUStrTok(NULL,"=",&TokPtr); } - if (!strcmp(OptArg,"about")) + if (!strcasecmp(OptArg,"about")) { fprintf(stderr,"%s client version %s\n", MSCHED_SNAME, @@ -3096,7 +3096,7 @@ exit(0); } - else if (!strcmp(OptArg,"configfile")) + else if (!strcasecmp(OptArg,"configfile")) { if (Value == NULL) { @@ -3110,24 +3110,24 @@ DBG(2,fCONFIG) DPrint("INFO: configfile set to '%s'\n", C.ConfigFile); } - else if (!strcmp(OptArg,"format")) + else if (!strcasecmp(OptArg,"format")) { C.Format = mwpXML; } - else if (!strcmp(OptArg,"help")) + else if (!strcasecmp(OptArg,"help")) { MCShowUsage(*CIndex); exit(1); } - else if ((!strcmp(OptArg,"host")) && (Value != NULL)) + else if ((!strcasecmp(OptArg,"host")) && (Value != NULL)) { MUStrCpy(C.ServerHost,Value,sizeof(MSched.ServerHost)); DBG(3,fCONFIG) DPrint("INFO: server host set to %s\n", C.ServerHost); } - else if (!strcmp(OptArg,"keyfile")) + else if (!strcasecmp(OptArg,"keyfile")) { FILE *fp; @@ -3157,7 +3157,7 @@ fclose(fp); } - else if (!strcmp(OptArg,"loglevel")) + else if (!strcasecmp(OptArg,"loglevel")) { if (Value == NULL) { @@ -3171,7 +3171,7 @@ DBG(2,fCONFIG) DPrint("INFO: LOGLEVEL set to %d\n", mlog.Threshold); } - else if (!strcmp(OptArg,"port")) + else if (!strcasecmp(OptArg,"port")) { if (Value == NULL) { @@ -3187,7 +3187,7 @@ DBG(2,fCONFIG) DPrint("INFO: port set to %d\n", C.ServerPort); } - else if (!strcmp(OptArg,"version")) + else if (!strcasecmp(OptArg,"version")) { fprintf(stderr,"%s client version %s\n", MSCHED_SNAME, @@ -3352,7 +3352,7 @@ Value = MUStrTok(NULL,"=",&TokPtr); } - if (!strcmp(OptArg,"configfile")) + if (!strcasecmp(OptArg,"configfile")) { if (Value == NULL) { @@ -3366,20 +3366,20 @@ DBG(2,fCONFIG) DPrint("INFO: configfile set to '%s'\n", C.ConfigFile); } - else if (!strcmp(OptArg,"help")) + else if (!strcasecmp(OptArg,"help")) { MCShowUsage(CIndex); exit(1); } - else if ((!strcmp(OptArg,"host")) && (Value != NULL)) + else if ((!strcasecmp(OptArg,"host")) && (Value != NULL)) { MUStrCpy(C.ServerHost,Value,sizeof(MSched.ServerHost)); DBG(3,fCONFIG) DPrint("INFO: server host set to %s\n", C.ServerHost); } - else if (!strcmp(OptArg,"keyfile")) + else if (!strcasecmp(OptArg,"keyfile")) { FILE *fp; @@ -3409,7 +3409,7 @@ fclose(fp); } - else if (!strcmp(OptArg,"loglevel")) + else if (!strcasecmp(OptArg,"loglevel")) { if (Value == NULL) { @@ -3423,7 +3423,7 @@ DBG(2,fCONFIG) DPrint("INFO: LOGLEVEL set to %d\n", mlog.Threshold); } - else if (!strcmp(OptArg,"port")) + else if (!strcasecmp(OptArg,"port")) { if (Value == NULL) { @@ -3439,7 +3439,7 @@ DBG(2,fCONFIG) DPrint("INFO: port set to %d\n", C.ServerPort); } - else if (!strcmp(OptArg,"version")) + else if (!strcasecmp(OptArg,"version")) { fprintf(stderr,"%s client version %s\n", MSCHED_SNAME, @@ -4544,7 +4544,7 @@ return(FAILURE); } - if (strcmp(C->Val,"success")) + if (strcasecmp(C->Val,"success")) { /* command failed */ @@ -4574,7 +4574,7 @@ MXMLDestroyE(&E); return(FAILURE); - } /* END if (strcmp(C->Val,"success")) */ + } /* END if (strcasecmp(C->Val,"success")) */ if (MXMLGetChild(E,"data",NULL,&C) == FAILURE) { diff -Naur maui-3.2.6p19/src/server/mprof.c maui-3.2.6p19-new/src/server/mprof.c --- maui-3.2.6p19/src/server/mprof.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/server/mprof.c 2007-01-25 18:41:53.000000000 +0000 @@ -721,7 +721,7 @@ for (index = 0;ProfileType[index] != NULL;index++) { - if (!strcmp(ProfileType[index],optarg)) + if (!strcasecmp(ProfileType[index],optarg)) break; } @@ -1814,7 +1814,7 @@ { for (aindex = 0;Profile.UserNameList[aindex][0] != '\0';aindex++) { - if (!strcmp(U->Name,Profile.UserNameList[aindex])) + if (!strcasecmp(U->Name,Profile.UserNameList[aindex])) break; } @@ -1955,7 +1955,7 @@ { for (aindex = 0;Profile.GroupNameList[aindex][0] != '\0';aindex++) { - if (!strcmp(G->Name,Profile.GroupNameList[aindex])) + if (!strcasecmp(G->Name,Profile.GroupNameList[aindex])) break; } @@ -2335,7 +2335,7 @@ /* ignore record if job not profiled */ - if ((Profile.Host[0] != '\0') && (strcmp(Profile.Host,J->MasterHostName))) + if ((Profile.Host[0] != '\0') && (strcasecmp(Profile.Host,J->MasterHostName))) continue; if ((J->Cred.Q != NULL) && !strstr(Profile.QOSList,J->Cred.Q->Name)) @@ -2345,7 +2345,7 @@ { for (aindex = 0;Profile.UserNameList[aindex][0] != '\0';aindex++) { - if (!strcmp(J->Cred.U->Name,Profile.UserNameList[aindex])) + if (!strcasecmp(J->Cred.U->Name,Profile.UserNameList[aindex])) break; } @@ -2357,7 +2357,7 @@ { for (aindex = 0;Profile.GroupNameList[aindex][0] != '\0';aindex++) { - if (!strcmp(J->Cred.G->Name,Profile.GroupNameList[aindex])) + if (!strcasecmp(J->Cred.G->Name,Profile.GroupNameList[aindex])) break; } @@ -2369,7 +2369,7 @@ { for (aindex = 0;Profile.AccountNameList[aindex][0] != '\0';aindex++) { - if (!strcmp(J->Cred.A->Name,Profile.AccountNameList[aindex])) + if (!strcasecmp(J->Cred.A->Name,Profile.AccountNameList[aindex])) break; } diff -Naur maui-3.2.6p19/src/server/omclient.c maui-3.2.6p19-new/src/server/omclient.c --- maui-3.2.6p19/src/server/omclient.c 2006-12-01 15:10:02.000000000 +0000 +++ maui-3.2.6p19-new/src/server/omclient.c 2007-01-25 18:41:53.000000000 +0000 @@ -265,7 +265,7 @@ case svcShowBackfillWindow: - if (!strcmp(OptArg,"ALL")) + if (!strcasecmp(OptArg,"ALL")) { strcpy(ClassString,ALL); } @@ -760,7 +760,7 @@ for (MIndex = 0;MComp[MIndex] != NULL;MIndex++) { - if (!strcmp(tmpLine,MComp[MIndex])) + if (!strcasecmp(tmpLine,MComp[MIndex])) break; } @@ -3185,7 +3185,7 @@ /* display prioritized list of idle jobs */ - if (strcmp(ParName,GLOBAL_MPARNAME) != 0) + if (strcasecmp(ParName,GLOBAL_MPARNAME) != 0) { fprintf(stdout,"Partition: %s\n", ParName); @@ -3449,7 +3449,7 @@ /* display partition */ - if (strcmp(ParName,GLOBAL_MPARNAME) != 0) + if (strcasecmp(ParName,GLOBAL_MPARNAME) != 0) { fprintf(stdout,"partition: %s\n", ParName); @@ -3823,7 +3823,7 @@ { tmpTime = (time_t)Time; - if (!strcmp(C.SchedulerMode,"SIMULATION")) + if (!strcasecmp(C.SchedulerMode,"SIMULATION")) { sprintf(TimeString,"current scheduler time: %s", ctime(&tmpTime)); @@ -4574,7 +4574,7 @@ while ((ptr = strtok(NULL,"\n")) != NULL) { - if (!strcmp(ptr,"[ENDACTIVE]")) + if (!strcasecmp(ptr,"[ENDACTIVE]")) break; acount++; @@ -4649,7 +4649,7 @@ while ((ptr = strtok(NULL,"\n")) != NULL) { - if (!strcmp(ptr,"[ENDIDLE]")) + if (!strcasecmp(ptr,"[ENDIDLE]")) break; count++; @@ -4707,7 +4707,7 @@ while ((ptr = strtok(NULL,"\n")) != NULL) { - if (!strcmp(ptr,"[ENDBLOCKED]")) + if (!strcasecmp(ptr,"[ENDBLOCKED]")) { break; }