Changeset 28294


Ignore:
Timestamp:
04/02/14 09:23:32 (10 years ago)
Author:
obi
Message:

fix httpdfunc.h

File:
1 edited

Legend:

Unmodified
Added
Removed
  • titan/titan/httpdfunc.h

    r28292 r28294  
    44724472        char* usecec = NULL;
    44734473        char* playerbufferseektime = NULL;
     4474        char* tmpstr = NULL;
    44744475
    44754476        anode = ostrstr(param, "node=");
     
    44774478                anode = anode + 5;
    44784479
    4479         volbartimeout = ostrstr(param, "volbartimeout=");
     4480        tmpstr = ostrcat(param, NULL, 0, 0);
     4481        if(tmpstr != NULL) volbartimeout = ostrstr(tmpstr, "volbartimeout=");
     4482        free(tmpstr); tmpstr = NULL;
    44804483        if(volbartimeout != NULL) volbartimeout = volbartimeout + 14;
    44814484        volbartimeout = stringreplacecharonce(volbartimeout, '&', '\0');
     
    44834486        debug(77, "volbartimeout: %s", volbartimeout);
    44844487
    4485         infobartimeout = ostrstr(param, "infobartimeout=");
     4488        tmpstr = ostrcat(param, NULL, 0, 0);
     4489        if(tmpstr != NULL) infobartimeout = ostrstr(tmpstr, "infobartimeout=");
     4490        free(tmpstr); tmpstr = NULL;
    44864491        if(infobartimeout != NULL) infobartimeout = infobartimeout + 15;
    44874492        infobartimeout = stringreplacecharonce(infobartimeout, '&', '\0');
     
    44894494        debug(77, "infobartimeout: %s", infobartimeout);
    44904495
    4491         infobarsleep = ostrstr(param, "infobarsleep=");
     4496        tmpstr = ostrcat(param, NULL, 0, 0);
     4497        if(tmpstr != NULL) infobarsleep = ostrstr(tmpstr, "infobarsleep=");
     4498        free(tmpstr); tmpstr = NULL;
    44924499        if(infobarsleep != NULL) infobarsleep = infobarsleep + 13;
    44934500        infobarsleep = stringreplacecharonce(infobarsleep, '&', '\0');
     
    44954502        debug(77, "infobarsleep: %s", infobarsleep);
    44964503
    4497         spinnerspeed = ostrstr(param, "spinnerspeed=");
     4504        tmpstr = ostrcat(param, NULL, 0, 0);
     4505        if(tmpstr != NULL) spinnerspeed = ostrstr(tmpstr, "spinnerspeed=");
     4506        free(tmpstr); tmpstr = NULL;
    44984507        if(spinnerspeed != NULL) spinnerspeed = spinnerspeed + 13;
    44994508        spinnerspeed = stringreplacecharonce(spinnerspeed, '&', '\0');
     
    45014510        debug(77, "spinnerspeed: %s", spinnerspeed);
    45024511
    4503         spinnertime = ostrstr(param, "spinnertime=");
     4512        tmpstr = ostrcat(param, NULL, 0, 0);
     4513        if(tmpstr != NULL) spinnertime = ostrstr(tmpstr, "spinnertime=");
     4514        free(tmpstr); tmpstr = NULL;
    45044515        if(spinnertime != NULL) spinnertime = spinnertime + 12;
    45054516        spinnertime = stringreplacecharonce(spinnertime, '&', '\0');
     
    45074518        debug(77, "spinnertime: %s", spinnertime);
    45084519
    4509         hangtime = ostrstr(param, "hangtime=");
     4520        tmpstr = ostrcat(param, NULL, 0, 0);
     4521        if(tmpstr != NULL) hangtime = ostrstr(tmpstr, "hangtime=");
     4522        free(tmpstr); tmpstr = NULL;
    45104523        if(hangtime != NULL) hangtime = hangtime + 9;
    45114524        hangtime = stringreplacecharonce(hangtime, '&', '\0');
     
    45134526        debug(77, "hangtime: %s", hangtime);
    45144527
    4515         secondinfobar = ostrstr(param, "secondinfobar=");
     4528        tmpstr = ostrcat(param, NULL, 0, 0);
     4529        if(tmpstr != NULL) secondinfobar = ostrstr(param, "secondinfobar=");
     4530        free(tmpstr); tmpstr = NULL;
    45164531        if(secondinfobar != NULL) secondinfobar = secondinfobar + 14;
    45174532        secondinfobar = stringreplacecharonce(secondinfobar, '&', '\0');
     
    45194534        debug(77, "secondinfobar: %s", secondinfobar);
    45204535
    4521         nozapclear = ostrstr(param, "nozapclear=");
     4536        tmpstr = ostrcat(param, NULL, 0, 0);
     4537        if(tmpstr != NULL) nozapclear = ostrstr(tmpstr, "nozapclear=");
     4538        free(tmpstr); tmpstr = NULL;
    45224539        if(nozapclear != NULL) nozapclear = nozapclear + 11;
    45234540        nozapclear = stringreplacecharonce(nozapclear, '&', '\0');
     
    45254542        debug(77, "nozapclear: %s", nozapclear);
    45264543
    4527         fastzap = ostrstr(param, "fastzap=");
     4544        tmpstr = ostrcat(param, NULL, 0, 0);
     4545        if(tmpstr != NULL) fastzap = ostrstr(tmpstr, "fastzap=");
     4546        free(tmpstr); tmpstr = NULL;
    45284547        if(fastzap != NULL) fastzap = fastzap + 8;
    45294548        fastzap = stringreplacecharonce(fastzap, '&', '\0');
     
    45314550        debug(77, "fastzap: %s", fastzap);
    45324551
    4533         faststop = ostrstr(param, "faststop=");
     4552        tmpstr = ostrcat(param, NULL, 0, 0);
     4553        if(tmpstr != NULL) faststop = ostrstr(tmpstr, "faststop=");
     4554        free(tmpstr); tmpstr = NULL;
    45344555        if(faststop != NULL) faststop = faststop + 9;
    45354556        faststop = stringreplacecharonce(faststop, '&', '\0');
     
    45374558        debug(77, "faststop: %s", faststop);
    45384559
    4539         dirsort = ostrstr(param, "dirsort=");
     4560        tmpstr = ostrcat(param, NULL, 0, 0);
     4561        if(tmpstr != NULL) dirsort = ostrstr(tmpstr, "dirsort=");
     4562        free(tmpstr); tmpstr = NULL;
    45404563        if(dirsort != NULL) dirsort = dirsort + 8;
    45414564        dirsort = stringreplacecharonce(dirsort, '&', '\0');
     
    45434566        debug(77, "dirsort: %s", dirsort);
    45444567
    4545         poweraktion = ostrstr(param, "poweraktion=");
     4568        tmpstr = ostrcat(param, NULL, 0, 0);
     4569        if(tmpstr != NULL) poweraktion = ostrstr(tmpstr, "poweraktion=");
     4570        free(tmpstr); tmpstr = NULL;
    45464571        if(poweraktion != NULL) poweraktion = poweraktion + 12;
    45474572        poweraktion = stringreplacecharonce(poweraktion, '&', '\0');
     
    45494574        debug(77, "poweraktion: %s", poweraktion);
    45504575
    4551         virtualzap = ostrstr(param, "virtualzap=");
     4576        tmpstr = ostrcat(param, NULL, 0, 0);
     4577        if(tmpstr != NULL) virtualzap = ostrstr(tmpstr, "virtualzap=");
     4578        free(tmpstr); tmpstr = NULL;
    45524579        if(virtualzap != NULL) virtualzap = virtualzap + 11;
    45534580        virtualzap = stringreplacecharonce(virtualzap, '&', '\0');
     
    45554582        debug(77, "virtualzap: %s", virtualzap);
    45564583
    4557         fasttextrender = ostrstr(param, "fasttextrender=");
     4584        tmpstr = ostrcat(param, NULL, 0, 0);
     4585        if(tmpstr != NULL) fasttextrender = ostrstr(tmpstr, "fasttextrender=");
     4586        free(tmpstr); tmpstr = NULL;
    45584587        if(fasttextrender != NULL) fasttextrender = fasttextrender + 15;
    45594588        fasttextrender = stringreplacecharonce(fasttextrender, '&', '\0');
     
    45614590        debug(77, "fasttextrender: %s", fasttextrender);
    45624591
    4563         recsplitsize = ostrstr(param, "recsplitsize=");
     4592        tmpstr = ostrcat(param, NULL, 0, 0);
     4593        if(tmpstr != NULL) recsplitsize = ostrstr(tmpstr, "recsplitsize=");
     4594        free(tmpstr); tmpstr = NULL;
    45644595        if(recsplitsize != NULL) recsplitsize = recsplitsize + 13;
    45654596        recsplitsize = stringreplacecharonce(recsplitsize, '&', '\0');
     
    45674598        debug(77, "recsplitsize: %s", recsplitsize);
    45684599
    4569         recforerun = ostrstr(param, "recforerun=");
     4600        tmpstr = ostrcat(param, NULL, 0, 0);
     4601        if(tmpstr != NULL) recforerun = ostrstr(tmpstr, "recforerun=");
     4602        free(tmpstr); tmpstr = NULL;
    45704603        if(recforerun != NULL) recforerun = recforerun + 11;
    45714604        recforerun = stringreplacecharonce(recforerun, '&', '\0');
    45724605        if(recforerun != NULL) addconfigtmp("recforerun", recforerun);
    45734606        debug(77, "recforerun: %s", recforerun);
    4574        
    4575         recoverrun = ostrstr(param, "recoverrun=");
     4607
     4608        tmpstr = ostrcat(param, NULL, 0, 0);   
     4609        if(tmpstr != NULL) recoverrun = ostrstr(tmpstr, "recoverrun=");
     4610        free(tmpstr); tmpstr = NULL;
    45764611        if(recoverrun != NULL) recoverrun = recoverrun + 11;
    45774612        recoverrun = stringreplacecharonce(recoverrun, '&', '\0');
     
    45794614        debug(77, "recoverrun: %s", recoverrun);
    45804615
    4581         skip13 = ostrstr(param, "skip13=");
     4616        tmpstr = ostrcat(param, NULL, 0, 0);
     4617        if(tmpstr != NULL) skip13 = ostrstr(tmpstr, "skip13=");
     4618        free(tmpstr); tmpstr = NULL;
    45824619        if(skip13 != NULL) skip13 = skip13 + 7;
    45834620        skip13 = stringreplacecharonce(skip13, '&', '\0');
     
    45854622        debug(77, "skip13: %s", skip13);
    45864623
    4587         skip46 = ostrstr(param, "skip46=");
     4624        tmpstr = ostrcat(param, NULL, 0, 0);
     4625        if(tmpstr != NULL) skip46 = ostrstr(tmpstr, "skip46=");
     4626        free(tmpstr); tmpstr = NULL;
    45884627        if(skip46 != NULL) skip46 = skip46 + 7;
    45894628        skip46 = stringreplacecharonce(skip46, '&', '\0');
     
    45914630        debug(77, "skip46: %s", skip46);
    45924631
    4593         skip79 = ostrstr(param, "skip79=");
     4632        tmpstr = ostrcat(param, NULL, 0, 0);
     4633        if(tmpstr != NULL) skip79 = ostrstr(tmpstr, "skip79=");
     4634        free(tmpstr); tmpstr = NULL;
    45944635        if(skip79 != NULL) skip79 = skip79 + 7;
    45954636        skip79 = stringreplacecharonce(skip79, '&', '\0');
     
    45974638        debug(77, "skip79: %s", skip79);
    45984639
    4599         playertype = ostrstr(param, "playertype=");
     4640        tmpstr = ostrcat(param, NULL, 0, 0);
     4641        if(tmpstr != NULL) playertype = ostrstr(tmpstr, "playertype=");
     4642        free(tmpstr); tmpstr = NULL;
    46004643        if(playertype != NULL) playertype = playertype + 11;
    46014644        playertype = stringreplacecharonce(playertype, '&', '\0');
     
    46034646        debug(77, "playertype: %s", playertype);
    46044647
    4605         autochangechannelname = ostrstr(param, "autochangechannelname=");
     4648        tmpstr = ostrcat(param, NULL, 0, 0);
     4649        if(tmpstr != NULL) autochangechannelname = ostrstr(tmpstr, "autochangechannelname=");
     4650        free(tmpstr); tmpstr = NULL;
    46064651        if(autochangechannelname != NULL) autochangechannelname = autochangechannelname + 22;
    46074652        autochangechannelname = stringreplacecharonce(autochangechannelname, '&', '\0');
     
    46094654        debug(77, "autochangechannelname: %s", autochangechannelname);
    46104655
    4611         def_rectimer_after = ostrstr(param, "def_rectimer_after=");
     4656        tmpstr = ostrcat(param, NULL, 0, 0);
     4657        if(tmpstr != NULL) def_rectimer_after = ostrstr(tmpstr, "def_rectimer_after=");
     4658        free(tmpstr); tmpstr = NULL;
    46124659        if(def_rectimer_after != NULL) def_rectimer_after = def_rectimer_after + 19;
    46134660        def_rectimer_after = stringreplacecharonce(def_rectimer_after, '&', '\0');
     
    46154662        debug(77, "def_rectimer_after: %s", def_rectimer_after);
    46164663
    4617         showchanneltimeline = ostrstr(param, "showchanneltimeline=");
     4664        tmpstr = ostrcat(param, NULL, 0, 0);
     4665        showchanneltimeline = ostrstr(tmpstr, "showchanneltimeline=");
     4666        free(tmpstr); tmpstr = NULL;
    46184667        if(showchanneltimeline != NULL) showchanneltimeline = showchanneltimeline + 20;
    46194668        showchanneltimeline = stringreplacecharonce(showchanneltimeline, '&', '\0');
     
    46214670        debug(77, "showchanneltimeline: %s", showchanneltimeline);
    46224671
    4623         screenanim = ostrstr(param, "screenanim=");
     4672        tmpstr = ostrcat(param, NULL, 0, 0);
     4673        if(tmpstr != NULL) screenanim = ostrstr(tmpstr, "screenanim=");
     4674        free(tmpstr); tmpstr = NULL;
    46244675        if(screenanim != NULL) screenanim = screenanim + 11;
    46254676        screenanim = stringreplacecharonce(screenanim, '&', '\0');
     
    46274678        debug(77, "screenanim: %s", screenanim);
    46284679
    4629         screenanimspeed = ostrstr(param, "screenanimspeed=");
     4680        tmpstr = ostrcat(param, NULL, 0, 0);
     4681        if(tmpstr != NULL) screenanimspeed = ostrstr(tmpstr, "screenanimspeed=");
     4682        free(tmpstr); tmpstr = NULL;
    46304683        if(screenanimspeed != NULL) screenanimspeed = screenanimspeed + 16;
    46314684        screenanimspeed = stringreplacecharonce(screenanimspeed, '&', '\0');
     
    46334686        debug(77, "screenanimspeed: %s", screenanimspeed);
    46344687
    4635         channellistview = ostrstr(param, "channellistview=");
     4688        tmpstr = ostrcat(param, NULL, 0, 0);
     4689        channellistview = ostrstr(tmpstr, "channellistview=");
     4690        free(tmpstr); tmpstr = NULL;
    46364691        if(channellistview != NULL) channellistview = channellistview + 16;
    46374692        channellistview = stringreplacecharonce(channellistview, '&', '\0');
     
    46394694        debug(77, "channellistview: %s", channellistview);
    46404695
    4641         showlastpos = ostrstr(param, "showlastpos=");
     4696        tmpstr = ostrcat(param, NULL, 0, 0);
     4697        if(tmpstr != NULL) showlastpos = ostrstr(tmpstr, "showlastpos=");
     4698        free(tmpstr); tmpstr = NULL;
    46424699        if(showlastpos != NULL) showlastpos = showlastpos + 12;
    46434700        showlastpos = stringreplacecharonce(showlastpos, '&', '\0');
     
    46454702        debug(77, "showlastpos: %s", showlastpos);
    46464703
    4647         recsync = ostrstr(param, "recsync=");
     4704        tmpstr = ostrcat(param, NULL, 0, 0);
     4705        if(tmpstr != NULL) recsync = ostrstr(tmpstr, "recsync=");
     4706        free(tmpstr); tmpstr = NULL;
    46484707        if(recsync != NULL) recsync = recsync + 8;
    46494708        recsync = stringreplacecharonce(recsync, '&', '\0');
     
    46514710        debug(77, "recsync: %s", recsync);
    46524711
    4653         recordnamefmt = ostrstr(param, "recordnamefmt=");
     4712        tmpstr = ostrcat(param, NULL, 0, 0);
     4713        recordnamefmt = ostrstr(tmpstr, "recordnamefmt=");
     4714        free(tmpstr); tmpstr = NULL;
    46544715        if(recordnamefmt != NULL) recordnamefmt = recordnamefmt + 14;
    46554716        recordnamefmt = stringreplacecharonce(recordnamefmt, '&', '\0');
     
    46574718        debug(77, "recordnamefmt: %s", recordnamefmt);
    46584719
    4659         newsletter = ostrstr(param, "newsletter=");
     4720        tmpstr = ostrcat(param, NULL, 0, 0);
     4721        if(tmpstr != NULL) newsletter = ostrstr(tmpstr, "newsletter=");
     4722        free(tmpstr); tmpstr = NULL;
    46604723        if(newsletter != NULL) newsletter = newsletter + 11;
    46614724        newsletter = stringreplacecharonce(newsletter, '&', '\0');
     
    46634726        debug(77, "newsletter: %s", newsletter);
    46644727
    4665         showhiddenfiles = ostrstr(param, "showhiddenfiles=");
     4728        tmpstr = ostrcat(param, NULL, 0, 0);
     4729        if(tmpstr != NULL) showhiddenfiles = ostrstr(tmpstr, "showhiddenfiles=");
     4730        free(tmpstr); tmpstr = NULL;
    46664731        if(showhiddenfiles != NULL) showhiddenfiles = showhiddenfiles + 16;
    46674732        showhiddenfiles = stringreplacecharonce(showhiddenfiles, '&', '\0');
     
    46694734        debug(77, "showhiddenfiles: %s", showhiddenfiles);
    46704735
    4671         expertmodus = ostrstr(param, "expertmodus=");
     4736        tmpstr = ostrcat(param, NULL, 0, 0);
     4737        if(tmpstr != NULL) expertmodus = ostrstr(tmpstr, "expertmodus=");
     4738        free(tmpstr); tmpstr = NULL;
    46724739        if(expertmodus != NULL) expertmodus = expertmodus + 12;
    46734740        expertmodus = stringreplacecharonce(expertmodus, '&', '\0');
     
    46754742        debug(77, "expertmodus: %s", expertmodus);
    46764743
    4677         infobarprogram = ostrstr(param, "infobarprogram=");
     4744        tmpstr = ostrcat(param, NULL, 0, 0);
     4745        if(tmpstr != NULL) infobarprogram = ostrstr(tmpstr, "infobarprogram=");
     4746        free(tmpstr); tmpstr = NULL;
    46784747        if(infobarprogram != NULL) infobarprogram = infobarprogram + 15;
    46794748        infobarprogram = stringreplacecharonce(infobarprogram, '&', '\0');
     
    46814750        debug(77, "infobarprogram: %s", infobarprogram);
    46824751
    4683         emucontrol = ostrstr(param, "emucontrol=");
     4752        tmpstr = ostrcat(param, NULL, 0, 0);
     4753        if(tmpstr != NULL) emucontrol = ostrstr(tmpstr, "emucontrol=");
     4754        free(tmpstr); tmpstr = NULL;
    46844755        if(emucontrol != NULL) emucontrol = emucontrol + 10;
    46854756        emucontrol = stringreplacecharonce(emucontrol, '&', '\0');
     
    46874758        debug(77, "emucontrol: %s", emucontrol);
    46884759
    4689         choiceminitv = ostrstr(param, "choiceminitv=");
     4760        tmpstr = ostrcat(param, NULL, 0, 0);
     4761        if(tmpstr != NULL) choiceminitv = ostrstr(tmpstr, "choiceminitv=");
     4762        free(tmpstr); tmpstr = NULL;
    46904763        if(choiceminitv != NULL) choiceminitv = choiceminitv + 13;
    46914764        choiceminitv = stringreplacecharonce(choiceminitv, '&', '\0');
     
    46934766        debug(77, "choiceminitv: %s", choiceminitv);
    46944767
    4695         usecec = ostrstr(param, "usecec=");
     4768        tmpstr = ostrcat(param, NULL, 0, 0);
     4769        if(tmpstr != NULL) usecec = ostrstr(tmpstr, "usecec=");
     4770        free(tmpstr); tmpstr = NULL;
    46964771        if(usecec != NULL) usecec = usecec + 7;
    46974772        usecec = stringreplacecharonce(usecec, '&', '\0');
    46984773        if(usecec != NULL) addconfigtmp("usecec", usecec);
    46994774        debug(77, "usecec: %s", usecec);
    4700  
    4701         playerbufferseektime = ostrstr(param, "playerbufferseektime=");
     4775
     4776        tmpstr = ostrcat(param, NULL, 0, 0);
     4777        if(tmpstr != NULL) playerbufferseektime = ostrstr(tmpstr, "playerbufferseektime=");
    47024778        if(playerbufferseektime != NULL) playerbufferseektime = playerbufferseektime + 21;
     4779        free(tmpstr); tmpstr = NULL;
    47034780        playerbufferseektime = stringreplacecharonce(playerbufferseektime, '&', '\0');
    47044781        if(playerbufferseektime != NULL) addconfigtmp("playerbufferseektime", playerbufferseektime);
Note: See TracChangeset for help on using the changeset viewer.