return(NULL);
found:
for(i = 0; i < sz; i++) {
- if((buf[sz] < 32) || (buf[sz] >= 128))
+ if((buf[i] < 32) || (buf[i] >= 128))
return(NULL);
}
buf[sz] = 0;
}
}
-static void usage(void)
-{
- flog(LOG_ERR, "usage: sendfile [-c CONTENT-TYPE] METHOD URL REST");
-}
-
static void sendwhole(int fd, struct stat *sb, const char *contype, int head)
{
printf("HTTP/1.1 200 OK\n");
sendwhole(fd, sb, contype, head);
}
+static void usage(void)
+{
+ flog(LOG_ERR, "usage: sendfile [-c CONTENT-TYPE] [-f FILE] METHOD URL REST");
+}
+
int main(int argc, char **argv)
{
int c;
char *file, *hdr;
struct stat sb;
- int fd, ishead;
+ int fd, ishead, ignrest;
const char *contype;
setlocale(LC_ALL, "");
contype = NULL;
- while((c = getopt(argc, argv, "c:")) >= 0) {
+ file = NULL;
+ ignrest = 0;
+ while((c = getopt(argc, argv, "c:f:")) >= 0) {
switch(c) {
case 'c':
contype = optarg;
break;
+ case 'f':
+ file = optarg;
+ ignrest = 1;
+ break;
default:
usage();
exit(1);
usage();
exit(1);
}
- if((file = getenv("REQ_X_ASH_FILE")) == NULL) {
- flog(LOG_ERR, "sendfile: needs to be called with the X-Ash-File header");
+ if((file == NULL) && ((file = getenv("REQ_X_ASH_FILE")) == NULL)) {
+ flog(LOG_ERR, "sendfile: needs to be called with either the X-Ash-File header or the -f option");
exit(1);
}
- if(*argv[optind + 2]) {
+ if(!ignrest && *argv[optind + 2]) {
simpleerror(1, 404, "Not Found", "The requested URL has no corresponding resource.");
exit(0);
}
simpleerror(1, 500, "Internal Error", "The server could not access its own data.");
exit(1);
}
+ if(!strcasecmp(argv[optind], "get")) {
+ ishead = 0;
+ } else if(!strcasecmp(argv[optind], "head")) {
+ ishead = 1;
+ } else {
+ simpleerror(1, 405, "Method not allowed", "The requested method is not defined for this resource.");
+ return(0);
+ }
if(contype == NULL)
contype = getmimetype(file, &sb);
contype = ckctype(contype);
checkcache(file, &sb);
- ishead = !strcasecmp(argv[optind], "head");
if((hdr = getenv("REQ_RANGE")) != NULL)
sendrange(fd, &sb, contype, hdr, ishead);
else