\n" "\n" - "" - "\n"); + "cellspacing=\"5\">\n" + "" + "\n"); for(i=0; i < ngroups; i++) { @@ -193,16 +193,16 @@ static int GroupsPage(const cGH *cctkGH, httpRequest *request, void *data) switch (CCTK_GroupTypeI(i)) { case CCTK_SCALAR: - ConcatCString(message,"Grid scalar"); - break; + ConcatCString(message,"Grid scalar"); + break; case CCTK_ARRAY: - ConcatCString(message,"Grid array"); - break; + ConcatCString(message,"Grid array"); + break; case CCTK_GF: - ConcatCString(message,"Grid function"); - break; + ConcatCString(message,"Grid function"); + break; } - + ConcatCString(message, " " ); ConcatCString(message, CCTK_VarTypeName(gdata.vartype) ); ConcatCString(message, "
\n("); diff --git a/src/Headers.c b/src/Headers.c index f24ac49..cf92f45 100644 --- a/src/Headers.c +++ b/src/Headers.c @@ -49,31 +49,31 @@ struct httpLink static const char *cactus_styles = "\n"; static const char *cactus_footer = diff --git a/src/Parameters.c b/src/Parameters.c index 3348494..55f0e98 100644 --- a/src/Parameters.c +++ b/src/Parameters.c @@ -216,17 +216,17 @@ static int MainParameterPage(const cGH *cctkGH, httpRequest *request, void *data HTTP_Send(request, "

Check/Modify Parameters

\n" "

From this page you can check the values of all parameters for \n" - "the simulation, and modify any parameters which have been \n" - "designated as steerable

\n" + "the simulation, and modify any parameters which have been \n" + "designated as steerable

\n" "

Parameters can be viewed for all Active Thorns, that is,\n" "for thorns which have been activated in the parameter file for the\n" " simulation. \n" "Select one of the active thorns for this simulation from the list \n" - "below to view all of its parameters

\n" + "below to view all of its parameters

\n" "

Steerable parameters can be identified by the presence of a \n" - "form input box, to change the value of a parameter, simply edit \n" - "the value in the box and press the submit button to register the \n" - "new values.

\n" + "form input box, to change the value of a parameter, simply edit \n" + "the value in the box and press the submit button to register the \n" + "new values.

\n" "

Groups	Group Properties	Variables
Groups	Group Properties	Variables

\n" "\n"); @@ -313,10 +313,10 @@ static int ThornParameterPage(const cGH *cctkGH, httpRequest *request, void *dat { first = 0; fprintf(stderr, "Setting %s::%s to %s\n", thorn, - HTTP_ArgName( argument), - HTTP_ArgValue( argument )); + HTTP_ArgName( argument), + HTTP_ArgValue( argument )); HTTP_SteerQueue(thorn, HTTP_ArgName( argument), - HTTP_ArgValue( argument )); + HTTP_ArgValue( argument )); } } SendHTTP_Redirect_Header( request ); @@ -401,7 +401,7 @@ static int ThornParameterPage(const cGH *cctkGH, httpRequest *request, void *dat "

Thorn "); ConcatCString(message, thorn); ConcatCString(message, - "

\n"); + "\n"); ConcatCString(message, "

Parameters in Cactus can be either fixed or steerable. \n" "Steerable parameters are those which can be modified during a simulation.\n" @@ -700,7 +700,7 @@ static int ParameterPage(const cGH *cctkGH, httpRequest *request, void *data) char *value; char user[USER_LENGTH+1] = EMPTYSTRING; int notauthorised = HTTP_AuthenticateBasic(request, "user", user, - USER_LENGTH); + USER_LENGTH); int readonly = notauthorised; if(HTTP_NumArguments( request ) > 0) @@ -718,10 +718,10 @@ static int ParameterPage(const cGH *cctkGH, httpRequest *request, void *data) { first = 0; fprintf(stderr, "Setting %s::%s to %s\n", pData->thorn, - HTTP_ArgName( argument), - HTTP_ArgValue( argument )); + HTTP_ArgName( argument), + HTTP_ArgValue( argument )); HTTP_SteerQueue(pData->thorn, HTTP_ArgName( argument), - HTTP_ArgValue( argument )); + HTTP_ArgValue( argument )); } } SendHTTP_Redirect_Header( request ); @@ -799,9 +799,9 @@ static int ParameterPage(const cGH *cctkGH, httpRequest *request, void *data) "

Return to all parameters for this \n" "thorn)); + CCTK_ThornImplementation(pData->thorn)); ConcatCString(message, - "\">thorn.

"); + "\">thorn. "); HTTP_SendString(request, message); @@ -815,7 +815,7 @@ static int ParameterPage(const cGH *cctkGH, httpRequest *request, void *data) { SetToCString(message,"

\n" - "

Thorn Name	Implementation

\n" ); ConcatCString(message, "\n\n

Name:

"); ConcatCString(message, pData->name); diff --git a/src/SStringHTML.c b/src/SStringHTML.c index 42a317b..d75cf48 100644 --- a/src/SStringHTML.c +++ b/src/SStringHTML.c @@ -14,27 +14,27 @@ StringReplaceCharWithCString( String * str, SSCHAR c, const SSCHAR *cstr ); String * StringSetToEncodedHTMLCString( String * str, const SSCHAR *c ) { - return StringEncodeHTML( StringSetToCString( str, c ) ); + return StringEncodeHTML( StringSetToCString( str, c ) ); } String * StringEncodeHTML( String * str ) { - StringReplaceCharWithCString( str, '&', "&" ); - StringReplaceCharWithCString( str, '<', "<" ); - StringReplaceCharWithCString( str, '>', ">" ); - return str; + StringReplaceCharWithCString( str, '&', "&" ); + StringReplaceCharWithCString( str, '<', "<" ); + StringReplaceCharWithCString( str, '>', ">" ); + return str; } String * StringReplaceCharWithCString( String * str, SSCHAR c, const SSCHAR *cstr ) { - size_t position = 0; - while( StringFindCharFrom( str, c, &position ) ) - { - StringDeleteChar( str, position ); - StringInsertCString( str, cstr, position ); - position ++; - } - return str; + size_t position = 0; + while( StringFindCharFrom( str, c, &position ) ) + { + StringDeleteChar( str, position ); + StringInsertCString( str, cstr, position ); + position ++; + } + return str; } diff --git a/src/Steer.c b/src/Steer.c index ed87922..e474325 100644 --- a/src/Steer.c +++ b/src/Steer.c @@ -374,7 +374,7 @@ static void ByteSwap(void *buf,int nelements,int elementsize) /* do the swap thing on each element */ for(s=0, d=elementsize-1; s < d; s++,d--) { - char c=buffer[s]; + char c=buffer[s]; buffer[s]=buffer[d]; buffer[d]=c; } diff --git a/src/Thorns.c b/src/Thorns.c index 99fe222..a0720bb 100644 --- a/src/Thorns.c +++ b/src/Thorns.c @@ -132,8 +132,8 @@ static int ThornMainPage(const cGH *cctkGH, httpRequest *request, void *data) HTTP_SendString(request, message ); HTTP_Send(request,"\n"); + "\t.thorns td { text-align: left; } \n" + "\n"); HTTP_Send(request,"\n\n"); /* HTTP_SendString out the header part. */ @@ -194,7 +194,7 @@ static int ThornMainPage(const cGH *cctkGH, httpRequest *request, void *data) HTTP_Send(request, "

Dormant Thorns

\n" "

\n" - "\n" + "

\n" "\n" "\n" "\n" diff --git a/src/base64.c b/src/base64.c index f209acf..bd09102 100644 --- a/src/base64.c +++ b/src/base64.c @@ -63,7 +63,7 @@ #include "base64.h" static const char Base64[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; static const char Pad64 = '='; /* (From RFC1521 and draft-ietf-dnssec-secext-03.txt) @@ -119,75 +119,75 @@ static const char Pad64 = '='; (1) the final quantum of encoding input is an integral multiple of 24 bits; here, the final unit of encoded - output will be an integral multiple of 4 characters - with no "=" padding, + output will be an integral multiple of 4 characters + with no "=" padding, (2) the final quantum of encoding input is exactly 8 bits; here, the final unit of encoded output will be two - characters followed by two "=" padding characters, or + characters followed by two "=" padding characters, or (3) the final quantum of encoding input is exactly 16 bits; here, the final unit of encoded output will be three - characters followed by one "=" padding character. + characters followed by one "=" padding character. */ int HTTP_b64_ntop(unsigned char *src, size_t srclength, char *target, size_t targsize) { - size_t datalength = 0; - unsigned char input[3]; - unsigned char output[4]; - size_t i; - - while (2 < srclength) { - input[0] = *src++; - input[1] = *src++; - input[2] = *src++; - srclength -= 3; - - output[0] = input[0] >> 2; - output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); - output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); - output[3] = input[2] & 0x3f; - Assert(output[0] < 64); - Assert(output[1] < 64); - Assert(output[2] < 64); - Assert(output[3] < 64); - - if (datalength + 4 > targsize) - return (-1); - target[datalength++] = Base64[output[0]]; - target[datalength++] = Base64[output[1]]; - target[datalength++] = Base64[output[2]]; - target[datalength++] = Base64[output[3]]; - } - - /* Now we worry about padding. */ - if (0 != srclength) { - /* Get what's left. */ - input[0] = input[1] = input[2] = '\0'; - for (i = 0; i < srclength; i++) - input[i] = *src++; - - output[0] = input[0] >> 2; - output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); - output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); - Assert(output[0] < 64); - Assert(output[1] < 64); - Assert(output[2] < 64); - - if (datalength + 4 > targsize) - return (-1); - target[datalength++] = Base64[output[0]]; - target[datalength++] = Base64[output[1]]; - if (srclength == 1) - target[datalength++] = Pad64; - else - target[datalength++] = Base64[output[2]]; - target[datalength++] = Pad64; - } - if (datalength >= targsize) - return (-1); - target[datalength] = '\0'; /* Returned value doesn't count \0. */ - return (datalength); + size_t datalength = 0; + unsigned char input[3]; + unsigned char output[4]; + size_t i; + + while (2 < srclength) { + input[0] = *src++; + input[1] = *src++; + input[2] = *src++; + srclength -= 3; + + output[0] = input[0] >> 2; + output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); + output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); + output[3] = input[2] & 0x3f; + Assert(output[0] < 64); + Assert(output[1] < 64); + Assert(output[2] < 64); + Assert(output[3] < 64); + + if (datalength + 4 > targsize) + return (-1); + target[datalength++] = Base64[output[0]]; + target[datalength++] = Base64[output[1]]; + target[datalength++] = Base64[output[2]]; + target[datalength++] = Base64[output[3]]; + } + + /* Now we worry about padding. */ + if (0 != srclength) { + /* Get what's left. */ + input[0] = input[1] = input[2] = '\0'; + for (i = 0; i < srclength; i++) + input[i] = *src++; + + output[0] = input[0] >> 2; + output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); + output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); + Assert(output[0] < 64); + Assert(output[1] < 64); + Assert(output[2] < 64); + + if (datalength + 4 > targsize) + return (-1); + target[datalength++] = Base64[output[0]]; + target[datalength++] = Base64[output[1]]; + if (srclength == 1) + target[datalength++] = Pad64; + else + target[datalength++] = Base64[output[2]]; + target[datalength++] = Pad64; + } + if (datalength >= targsize) + return (-1); + target[datalength] = '\0'; /* Returned value doesn't count \0. */ + return (datalength); } /* skips all whitespace anywhere. @@ -198,129 +198,129 @@ int HTTP_b64_ntop(unsigned char *src, size_t srclength, int HTTP_b64_pton(const char *src, unsigned char *target, size_t targsize) { - size_t tarindex; - int state, ch; - char *pos; - - state = 0; - tarindex = 0; - - while ((ch = *src++) != '\0') { - if (isspace(ch)) /* Skip whitespace anywhere. */ - continue; - - if (ch == Pad64) - break; - - pos = strchr(Base64, ch); - if (pos == 0) /* A non-base64 character. */ - return (-1); - - switch (state) { - case 0: - if (target) { - if (tarindex >= targsize) - return (-1); - target[tarindex] = (pos - Base64) << 2; - } - state = 1; - break; - case 1: - if (target) { - if (tarindex + 1 >= targsize) - return (-1); - target[tarindex] |= (pos - Base64) >> 4; - target[tarindex+1] = ((pos - Base64) & 0x0f) - << 4 ; - } - tarindex++; - state = 2; - break; - case 2: - if (target) { - if (tarindex + 1 >= targsize) - return (-1); - target[tarindex] |= (pos - Base64) >> 2; - target[tarindex+1] = ((pos - Base64) & 0x03) - << 6; - } - tarindex++; - state = 3; - break; - case 3: - if (target) { - if (tarindex >= targsize) - return (-1); - target[tarindex] |= (pos - Base64); - } - tarindex++; - state = 0; - break; - default: - abort(); - } - } - - /* - * We are done decoding Base-64 chars. Let's see if we ended - * on a byte boundary, and/or with erroneous trailing characters. - */ - - if (ch == Pad64) { /* We got a pad char. */ - ch = *src++; /* Skip it, get next. */ - switch (state) { - case 0: /* Invalid = in first position */ - case 1: /* Invalid = in second position */ - return (-1); - - case 2: /* Valid, means one byte of info */ - /* Skip any number of spaces. */ + size_t tarindex; + int state, ch; + char *pos; + + state = 0; + tarindex = 0; + + while ((ch = *src++) != '\0') { + if (isspace(ch)) /* Skip whitespace anywhere. */ + continue; + + if (ch == Pad64) + break; + + pos = strchr(Base64, ch); + if (pos == 0) /* A non-base64 character. */ + return (-1); + + switch (state) { + case 0: + if (target) { + if (tarindex >= targsize) + return (-1); + target[tarindex] = (pos - Base64) << 2; + } + state = 1; + break; + case 1: + if (target) { + if (tarindex + 1 >= targsize) + return (-1); + target[tarindex] |= (pos - Base64) >> 4; + target[tarindex+1] = ((pos - Base64) & 0x0f) + << 4 ; + } + tarindex++; + state = 2; + break; + case 2: + if (target) { + if (tarindex + 1 >= targsize) + return (-1); + target[tarindex] |= (pos - Base64) >> 2; + target[tarindex+1] = ((pos - Base64) & 0x03) + << 6; + } + tarindex++; + state = 3; + break; + case 3: + if (target) { + if (tarindex >= targsize) + return (-1); + target[tarindex] |= (pos - Base64); + } + tarindex++; + state = 0; + break; + default: + abort(); + } + } + + /* + * We are done decoding Base-64 chars. Let's see if we ended + * on a byte boundary, and/or with erroneous trailing characters. + */ + + if (ch == Pad64) { /* We got a pad char. */ + ch = *src++; /* Skip it, get next. */ + switch (state) { + case 0: /* Invalid = in first position */ + case 1: /* Invalid = in second position */ + return (-1); + + case 2: /* Valid, means one byte of info */ + /* Skip any number of spaces. */ #ifdef _LIBC - /* To avoid warnings. */ - for ( ; ch != '\0'; ch = *src++) + /* To avoid warnings. */ + for ( ; ch != '\0'; ch = *src++) #else - for (NULL; ch != '\0'; ch = *src++) + for (NULL; ch != '\0'; ch = *src++) #endif - if (!isspace(ch)) - break; - /* Make sure there is another trailing = sign. */ - if (ch != Pad64) - return (-1); - ch = *src++; /* Skip the = */ - /* Fall through to "single trailing =" case. */ - /* FALLTHROUGH */ - - case 3: /* Valid, means two bytes of info */ - /* - * We know this char is an =. Is there anything but - * whitespace after it? - */ + if (!isspace(ch)) + break; + /* Make sure there is another trailing = sign. */ + if (ch != Pad64) + return (-1); + ch = *src++; /* Skip the = */ + /* Fall through to "single trailing =" case. */ + /* FALLTHROUGH */ + + case 3: /* Valid, means two bytes of info */ + /* + * We know this char is an =. Is there anything but + * whitespace after it? + */ #ifdef _LIBC - /* To avoid warnings. */ - for ( ; ch != '\0'; ch = *src++) + /* To avoid warnings. */ + for ( ; ch != '\0'; ch = *src++) #else - for (NULL; ch != '\0'; ch = *src++) + for (NULL; ch != '\0'; ch = *src++) #endif - if (!isspace(ch)) - return (-1); - - /* - * Now make sure for cases 2 and 3 that the "extra" - * bits that slopped past the last full byte were - * zeros. If we don't check them, they become a - * subliminal channel. - */ - if (target && target[tarindex] != 0) - return (-1); - } - } else { - /* - * We ended by seeing the end of the string. Make sure we - * have no partial bytes lying around. - */ - if (state != 0) - return (-1); - } - - return (tarindex); + if (!isspace(ch)) + return (-1); + + /* + * Now make sure for cases 2 and 3 that the "extra" + * bits that slopped past the last full byte were + * zeros. If we don't check them, they become a + * subliminal channel. + */ + if (target && target[tarindex] != 0) + return (-1); + } + } else { + /* + * We ended by seeing the end of the string. Make sure we + * have no partial bytes lying around. + */ + if (state != 0) + return (-1); + } + + return (tarindex); } diff --git a/src/http.c b/src/http.c index a2e2ff1..36fcc5f 100644 --- a/src/http.c +++ b/src/http.c @@ -139,7 +139,7 @@ httpSocket * HTTP_Connection( const httpRequest *request ) } SSBOOL HTTP_GetHeaderValueString(const httpRequest *request, - const String *header, String *value) + const String *header, String *value) { const char * v = HTTP_HeaderValue(request, GetBuffer( header ) ); if( v ) @@ -752,7 +752,7 @@ static int StripArgs(httpRequest *request, char *request_uri) } /* Append to local list */ - /* SW it isn't perfecty obvious this non NULL */ + /* SW it isn't perfecty obvious this non NULL */ last->next = argument; } else -- cgit v1.2.3

Thorn Name	Implementation

"); Concat(message, title ); ConcatCString(message, - "

Run Control

Run Until

Groups and Grid Variables

Check/Modify Parameters

Thorn "); ConcatCString(message, thorn); ConcatCString(message, - "

Dormant Thorns