--- libaitwww/example/test_url.c 2012/08/06 12:02:05 1.2.6.3 +++ libaitwww/example/test_url.c 2012/09/04 12:29:07 1.2.6.4 @@ -12,34 +12,31 @@ int main(int argc, char **argv) { struct tagIOURL URL; int ret = 0; - char szVal[BUFSIZ]; cgi_t *cgi; ait_val_t *v; if (argc > 1) { printf("URL:: Return=%x --- URL=%s\n", (ret = www_URLGet(argv[1], &URL)), argv[1]); - printf("URL:: (%x) ***Line=%s\n", ret, URL.url_line); - printf("URL:: (%x) tech=%s(%d)\n", ret & 1, URL.url_tech.value, URL.url_tech.vallen); - printf("URL:: (%x) user=%s(%d)\n", ret & 2, URL.url_user.value, URL.url_user.vallen); - printf("URL:: (%x) pass=%s(%d)\n", ret & 4, URL.url_pass.value, URL.url_pass.vallen); - printf("URL:: (%x) host=%s(%d)\n", ret & 8, URL.url_host.value, URL.url_host.vallen); - printf("URL:: (%x) port=%s(%d)\n", ret & 16, URL.url_port.value, URL.url_port.vallen); - printf("URL:: (%x) path=%s(%d)\n", ret & 32, URL.url_path.value, URL.url_path.vallen); - printf("URL:: (%x) args=%s(%d)\n", ret & 64, URL.url_args.value, URL.url_args.vallen); + printf("URL:: (%x) ***Line=%s\n", ret, AIT_GET_STRZ(&URL.url_line)); + printf("URL:: (%x) tech=%s(%d)\n", ret & 1, AIT_GET_STR(&URL.url_tech), AIT_LEN(&URL.url_tech)); + printf("URL:: (%x) user=%s(%d)\n", ret & 2, AIT_GET_STR(&URL.url_user), AIT_LEN(&URL.url_user)); + printf("URL:: (%x) pass=%s(%d)\n", ret & 4, AIT_GET_STR(&URL.url_pass), AIT_LEN(&URL.url_pass)); + printf("URL:: (%x) host=%s(%d)\n", ret & 8, AIT_GET_STR(&URL.url_host), AIT_LEN(&URL.url_host)); + printf("URL:: (%x) port=%s(%d)\n", ret & 16, AIT_GET_STR(&URL.url_port), AIT_LEN(&URL.url_port)); + printf("URL:: (%x) path=%s(%d)\n", ret & 32, AIT_GET_STR(&URL.url_path), AIT_LEN(&URL.url_path)); + printf("URL:: (%x) args=%s(%d)\n", ret & 64, AIT_GET_STR(&URL.url_args), AIT_LEN(&URL.url_args)); printf("URL:: (%x) +++reserved=%s\n", ret & 128, URL.url_reserved); - www_unescape(URL.url_path.value); - v = www_undot(URL.url_path.value); - printf("Path:: '%s' -> ", URL.url_path.value); + v = www_undot(AIT_GET_STR(&URL.url_path)); + printf("Path:: '%s' -> ", AIT_GET_STR(&URL.url_path)); printf("validated %s ", v ? "YES" : "NO"); if (v) printf("'%s'", AIT_GET_STR(v)); printf("\n"); io_freeVar(&v); - memset(szVal, 0, BUFSIZ); - cgi = www_parseQuery(URL.url_args.value); + cgi = www_parseQuery(AIT_GET_STR(&URL.url_args)); printf("Get_url:: %s Attribute=piuk\n", www_getValue(cgi, "piuk")); printf("Get_url:: %s Attribute=sg\n", www_getValue(cgi, "sg")); printf("Get_url:: %s Attribute=sgg\n", www_getValue(cgi, "sgg")); @@ -48,7 +45,11 @@ int main(int argc, char **argv) printf("Get_url:: %s Attribute=vv\n", www_getValue(cgi, "vv")); www_closeCGI(&cgi); - printf("File_url:: File=%s %d\n", szVal, www_URLGetFile(&URL, szVal, BUFSIZ)); + v = io_allocVar(); + printf("File_url:: File=%s %d\n", AIT_GET_STR(v), www_URLGetFile(&URL, v)); + io_freeVar(&v); + + www_URLFree(&URL); } return 0;