htdocs/archive: minor fixes and cleanup

This commit is contained in:
Daniel Marjamäki 2013-07-13 10:23:10 +02:00
parent d1ec81771c
commit 3185b1b118
3 changed files with 48 additions and 63 deletions

View File

@ -5,73 +5,58 @@
#include "webarchive.h"
const char *validate(const char *data)
{
int i;
if (strncmp(data,"name=",5) != 0)
return "invalid query string: must start with 'name='";
i = 5;
while (isalnum(data[i]))
i++;
if (i == 5)
return "invalid query string: no name";
if (i > 35)
return "invalid query string: max name size is 32";
if (data[i] != '\0')
return "invalid delete command";
return NULL;
}
int main()
{
const char *query_string = getenv("QUERY_STRING");
if (query_string == NULL) {
generatepage("Internal error: invalid request");
} else if (NULL != validate(query_string)) {
generatepage(validate(query_string));
} else {
char *data[MAX_RECORDS] = {0};
if (!readdata(data, MAX_RECORDS)) {
generatepage("Failed to delete file, try again");
return EXIT_SUCCESS;
}
sortdata(data, MAX_RECORDS);
char name[32] = {0};
strcpy(name, getname(query_string));
int index = -1;
for (int i = 0; i < MAX_RECORDS && data[i]; i++) {
if (strcmp(name, getname(data[i])) == 0) {
index = i;
break;
}
}
if (index == -1) {
generatepage("File not found");
return EXIT_SUCCESS;
}
FILE *f = fopen("data.txt", "wt");
if (f == NULL) {
generatepage("Failed to delete file (access denied)");
return EXIT_SUCCESS;
}
int deleted = 0;
for (int i = 0; i < MAX_RECORDS && data[i]; i++) {
if (i != index)
fprintf(f, "%s\n", data[i]);
else
deleted = 1;
}
fclose(f);
generatepage(deleted ? "File deleted" : "Failed to delete file");
return EXIT_SUCCESS;
}
if (NULL != validate_name_version(query_string)) {
generatepage(validate_name_version(query_string));
return EXIT_SUCCESS;
}
char *data[MAX_RECORDS] = {0};
if (!readdata(data, MAX_RECORDS)) {
generatepage("Failed to delete file, try again");
return EXIT_SUCCESS;
}
sortdata(data, MAX_RECORDS);
char name[32] = {0};
strcpy(name, getname(query_string));
int index = -1;
for (int i = 0; i < MAX_RECORDS && data[i]; i++) {
if (strcmp(name, getname(data[i])) == 0) {
index = i;
break;
}
}
if (index == -1) {
generatepage("File not found");
return EXIT_SUCCESS;
}
FILE *f = fopen("data.txt", "wt");
if (f == NULL) {
generatepage("Failed to delete file (access denied)");
return EXIT_SUCCESS;
}
int deleted = 0;
for (int i = 0; i < MAX_RECORDS && data[i]; i++) {
if (i != index)
fprintf(f, "%s\n", data[i]);
else
deleted = 1;
}
fclose(f);
generatepage(deleted ? "File deleted" : "Failed to delete file");
return EXIT_SUCCESS;
}

View File

@ -57,8 +57,8 @@ int main()
puts("<body>");
puts(" <form action=\"http://cppcheck.sf.net/cgi-bin/setfiledata.cgi\" method=\"get\">");
printf(" <textarea name=\"name\" cols=\"30\" rows=\"1\" readonly>%s</textarea>\n",name);
printf(" <textarea name=\"name\" cols=\"30\" rows=\"1\" readonly>%i</textarea>\n",version);
printf(" <textarea name=\"data\" cols=\"60\" rows=\"20\" maxsize=\"512\">123</textarea><br>\n",olddata);
printf(" <textarea name=\"version\" cols=\"30\" rows=\"1\" readonly>%i</textarea><br>\n",1+version);
printf(" <textarea name=\"data\" cols=\"60\" rows=\"20\" maxsize=\"512\">%s</textarea><br>\n",olddata);
puts(" <input type=\"submit\" value=\"Save\">");
puts(" </form>");
puts("</body>");

View File

@ -97,7 +97,7 @@ void generatepage(const char msg[])
puts("Content-type: text/html\r\n\r\n");
puts("<html>");
puts("<head><script>");
puts("function ok() { window.location = \"http://cppcheck.sf.net/cgi-bin/report.cgi\"; }");
puts("function ok() { window.location = \"http://cppcheck.sf.net/archive/test.php\"; }");
puts("</script></head>");
puts("<body>");
puts(msg);