+
/*
- * $Id: utils.c 6808 2008-12-11 00:00:36Z dothebart $
- *
* de/encoding stuff. hopefully mostly to be depricated in favour of subst.c + strbuf
*/
/*
* remove escaped strings from i.e. the url string (like %20 for blanks)
*/
-long unescape_input(char *buf)
-{
+long unescape_input(char *buf) {
unsigned int a, b;
char hex[3];
long buflen;
buflen = strlen(buf);
- while ((buflen > 0) && (isspace(buf[buflen - 1]))){
+ while ((buflen > 0) && (isspace(buf[buflen - 1]))) {
buf[buflen - 1] = 0;
- buflen --;
+ buflen--;
}
- a = 0;
+ a = 0;
while (a < buflen) {
if (buf[a] == '+')
buf[a] = ' ';
buf[a] = '\0';
buflen = a;
}
- else {
+ else {
hex[0] = buf[a + 1];
hex[1] = buf[a + 2];
hex[2] = 0;
len = buflen - a - 2;
if (len > 0)
memmove(&buf[a + 1], &buf[a + 3], len);
-
- buflen -=2;
+
+ buflen -= 2;
}
}
a++;
* nbsp If nonzero, spaces are converted to non-breaking spaces.
* nolinebreaks if set, linebreaks are removed from the string.
*/
-long stresc(char *target, long tSize, char *strbuf, int nbsp, int nolinebreaks)
-{
- char *aptr, *bptr, *eptr;
-
- *target = '\0';
- aptr = strbuf;
- bptr = target;
- eptr = target + tSize - 6; /* our biggest unit to put in... */
-
-
- while ((bptr < eptr) && !IsEmptyStr(aptr) ){
- if (*aptr == '<') {
- memcpy(bptr, "<", 4);
- bptr += 4;
- }
- else if (*aptr == '>') {
- memcpy(bptr, ">", 4);
- bptr += 4;
- }
- else if (*aptr == '&') {
- memcpy(bptr, "&", 5);
- bptr += 5;
- }
- else if (*aptr == '\"') {
- memcpy(bptr, """, 6);
- bptr += 6;
- }
- else if (*aptr == '\'') {
- memcpy(bptr, "'", 5);
- bptr += 5;
- }
- else if (*aptr == LB) {
- *bptr = '<';
- bptr ++;
- }
- else if (*aptr == RB) {
- *bptr = '>';
- bptr ++;
- }
- else if (*aptr == QU) {
- *bptr ='"';
- bptr ++;
- }
- else if ((*aptr == 32) && (nbsp == 1)) {
- memcpy(bptr, " ", 6);
- bptr += 6;
- }
- else if ((*aptr == '\n') && (nolinebreaks)) {
- *bptr='\0'; /* nothing */
- }
- else if ((*aptr == '\r') && (nolinebreaks)) {
- *bptr='\0'; /* nothing */
- }
- else{
- *bptr = *aptr;
- bptr++;
- }
- aptr ++;
- }
- *bptr = '\0';
- if ((bptr = eptr - 1 ) && !IsEmptyStr(aptr) )
- return -1;
- return (bptr - target);
-}
-
+long stresc(char *target, long tSize, char *strbuf, int nbsp, int nolinebreaks) {
+ char *aptr, *bptr, *eptr;
-void escputs1(const char *strbuf, int nbsp, int nolinebreaks)
-{
- StrEscAppend(WC->WBuf, NULL, strbuf, nbsp, nolinebreaks);
-}
+ *target = '\0';
+ aptr = strbuf;
+ bptr = target;
+ eptr = target + tSize - 6; /* our biggest unit to put in... */
-void StrEscputs1(const StrBuf *strbuf, int nbsp, int nolinebreaks)
-{
- StrEscAppend(WC->WBuf, strbuf, NULL, nbsp, nolinebreaks);
-}
-/*
- * static wrapper for ecsputs1
- */
-void escputs(const char *strbuf)
-{
- escputs1(strbuf, 0, 0);
+ while ((bptr < eptr) && !IsEmptyStr(aptr)) {
+ if (*aptr == '<') {
+ memcpy(bptr, "<", 4);
+ bptr += 4;
+ }
+ else if (*aptr == '>') {
+ memcpy(bptr, ">", 4);
+ bptr += 4;
+ }
+ else if (*aptr == '&') {
+ memcpy(bptr, "&", 5);
+ bptr += 5;
+ }
+ else if (*aptr == '\"') {
+ memcpy(bptr, """, 6);
+ bptr += 6;
+ }
+ else if (*aptr == '\'') {
+ memcpy(bptr, "'", 5);
+ bptr += 5;
+ }
+ else if (*aptr == LB) {
+ *bptr = '<';
+ bptr++;
+ }
+ else if (*aptr == RB) {
+ *bptr = '>';
+ bptr++;
+ }
+ else if (*aptr == QU) {
+ *bptr = '"';
+ bptr++;
+ }
+ else if ((*aptr == 32) && (nbsp == 1)) {
+ memcpy(bptr, " ", 6);
+ bptr += 6;
+ }
+ else if ((*aptr == '\n') && (nolinebreaks)) {
+ *bptr = '\0'; /* nothing */
+ }
+ else if ((*aptr == '\r') && (nolinebreaks)) {
+ *bptr = '\0'; /* nothing */
+ }
+ else {
+ *bptr = *aptr;
+ bptr++;
+ }
+ aptr++;
+ }
+ *bptr = '\0';
+ if ((bptr = eptr - 1) && !IsEmptyStr(aptr))
+ return -1;
+ return (bptr - target);
}
-
/*
* static wrapper for ecsputs1
*/
-void StrEscPuts(const StrBuf *strbuf)
-{
- StrEscputs1(strbuf, 0, 0);
+void escputs(const char *strbuf) {
+ StrEscAppend(WC->WBuf, NULL, strbuf, 0, 0);
}
-
/*
* urlescape buffer and print it to the client
*/
-void urlescputs(const char *strbuf)
-{
+void urlescputs(const char *strbuf) {
StrBufUrlescAppend(WC->WBuf, NULL, strbuf);
}
-/*
- * urlescape buffer and print it to the client
- */
-void UrlescPutStrBuf(const StrBuf *strbuf)
-{
- StrBufUrlescAppend(WC->WBuf, strbuf, NULL);
-}
/**
* urlescape buffer and print it as header
*/
-void hurlescputs(const char *strbuf)
-{
+void hurlescputs(const char *strbuf) {
StrBufUrlescAppend(WC->HBuf, NULL, strbuf);
}
/*
- * Copy a string, escaping characters for JavaScript strings.
+ * Output a string to the client as a CDATA block
*/
-void jsesc(char *target, size_t tlen, char *strbuf)
-{
- int len;
- char *tend;
- char *send;
- char *tptr;
- char *sptr;
-
- target[0]='\0';
- len = strlen (strbuf);
- send = strbuf + len;
- tend = target + tlen;
- sptr = strbuf;
- tptr = target;
-
- while (!IsEmptyStr(sptr) &&
- (sptr < send) &&
- (tptr < tend)) {
-
- if (*sptr == '<')
- *tptr = '[';
- else if (*sptr == '>')
- *tptr = ']';
- else if (*sptr == '\'') {
- if (tend - tptr < 3)
- return;
- *(tptr++) = '\\';
- *tptr = '\'';
- }
- else if (*sptr == '"') {
- if (tend - tptr < 8)
- return;
- *(tptr++) = '&';
- *(tptr++) = 'q';
- *(tptr++) = 'u';
- *(tptr++) = 'o';
- *(tptr++) = 't';
- *tptr = ';';
+void cdataout(char *rawdata) {
+ char *ptr = rawdata;
+ wc_printf("<![CDATA[");
+
+ while ((ptr != NULL) && (ptr[0] != 0)) {
+ if (!strncmp(ptr, "]]>", 3)) {
+ wc_printf("]]]]><![CDATA[>");
+ ++ptr;
+ ++ptr;
+ ++ptr;
}
- else if (*sptr == '&') {
- if (tend - tptr < 7)
- return;
- *(tptr++) = '&';
- *(tptr++) = 'a';
- *(tptr++) = 'm';
- *(tptr++) = 'p';
- *tptr = ';';
- } else {
- *tptr = *sptr;
+ else {
+ wc_printf("%c", ptr[0]);
+ ++ptr;
}
- tptr++; sptr++;
}
- *tptr = '\0';
-}
-/*
- * escape and print javascript
- */
-void jsescputs(char *strbuf)
-{
- char outbuf[SIZ];
-
- jsesc(outbuf, SIZ, strbuf);
- wprintf("%s", outbuf);
+ wc_printf("]]>");
}
-
-/*
- * print a string to the client after cleaning it with msgesc() and stresc()
- */
-void msgescputs1( char *strbuf)
-{
- StrBuf *OutBuf;
-
- if ((strbuf == NULL) || IsEmptyStr(strbuf))
- return;
- OutBuf = NewStrBuf();
- StrMsgEscAppend(OutBuf, NULL, strbuf);
- StrEscAppend(WC->WBuf, OutBuf, NULL, 0, 0);
- FreeStrBuf(&OutBuf);
-}
-
-/*
- * print a string to the client after cleaning it with msgesc()
- */
-void msgescputs(char *strbuf) {
- if ((strbuf != NULL) && !IsEmptyStr(strbuf))
- StrMsgEscAppend(WC->WBuf, NULL, strbuf);
-}
-
-
-
projects / citadel.git / blobdiff