Browse Source

scan_urlencoded2 is like scan_urlencoded, but it will not decode '+' in urls

master
Felix von Leitner 16 years ago
parent
commit
f1c6695b15
3 changed files with 12 additions and 3 deletions
  1. +1
    -1
      Makefile
  2. +1
    -0
      textcode.h
  3. +10
    -2
      textcode/scan_urlencoded.c

+ 1
- 1
Makefile View File

@@ -637,7 +637,7 @@ uninstall:
rm -f $(patsubst %.3,$(MAN3DIR)/%.3,$(notdir $(wildcard */*.3)))
rm -f $(LIBDIR)/libowfat.a

VERSION=libowfat-0.21
VERSION=libowfat-0.22
CURNAME=libowfat-0.21

tar: clean rename


+ 1
- 0
textcode.h View File

@@ -24,6 +24,7 @@ unsigned long scan_uuencoded(const char *src,char *dest,unsigned long *destlen);
unsigned long scan_base64(const char *src,char *dest,unsigned long *destlen);
unsigned long scan_quotedprintable(const char *src,char *dest,unsigned long *destlen);
unsigned long scan_urlencoded(const char *src,char *dest,unsigned long *destlen);
unsigned long scan_urlencoded2(const char *src,char *dest,unsigned long *destlen);
unsigned long scan_yenc(const char *src,char *dest,unsigned long *destlen);
unsigned long scan_hexdump(const char *src,char *dest,unsigned long *destlen);
unsigned long scan_html(const char *src,char *dest,unsigned long *destlen);


+ 10
- 2
textcode/scan_urlencoded.c View File

@@ -2,7 +2,7 @@
#include "textcode.h"
#include "scan.h"

unsigned long scan_urlencoded(const char *src,char *dest,unsigned long *destlen) {
static unsigned long inner_scan_urlencoded(const char *src,char *dest,unsigned long *destlen,int plus) {
register const unsigned char* s=(const unsigned char*) src;
unsigned long written=0,i;
for (i=0; s[i]; ++i) {
@@ -14,7 +14,7 @@ unsigned long scan_urlencoded(const char *src,char *dest,unsigned long *destlen)
if (j<0) break;
dest[written]|=j;
i+=2;
} else if (s[i]=='+')
} else if (s[i]=='+' && plus)
dest[written]=' ';
else
dest[written]=s[i];
@@ -23,3 +23,11 @@ unsigned long scan_urlencoded(const char *src,char *dest,unsigned long *destlen)
*destlen=written;
return i;
}

unsigned long scan_urlencoded(const char *src,char *dest,unsigned long *destlen) {
return inner_scan_urlencoded(src,dest,destlen,1);
}

unsigned long scan_urlencoded2(const char *src,char *dest,unsigned long *destlen) {
return inner_scan_urlencoded(src,dest,destlen,0);
}

Loading…
Cancel
Save