/[jscoverage]/trunk/jscoverage-server.c
ViewVC logotype

Diff of /trunk/jscoverage-server.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 189 by siliconforks, Tue Sep 23 03:48:37 2008 UTC revision 275 by siliconforks, Sat Oct 11 22:38:05 2008 UTC
# Line 242  Line 242 
242      return c - '0';      return c - '0';
243    }    }
244    else if ('A' <= c && c <= 'F') {    else if ('A' <= c && c <= 'F') {
245      return c - 'A';      return c - 'A' + 10;
246    }    }
247    else if ('a' <= c && c <= 'f') {    else if ('a' <= c && c <= 'f') {
248      return c - 'a';      return c - 'a' + 10;
249    }    }
250    else {    else {
251      return 0;      return 0;
# Line 566  Line 566 
566    
567  static int write_json(Coverage * coverage, const char * path) {  static int write_json(Coverage * coverage, const char * path) {
568    /* write the JSON */    /* write the JSON */
569    FILE * f = fopen(path, "w");    FILE * f = fopen(path, "wb");
570    if (f == NULL) {    if (f == NULL) {
571      return -1;      return -1;
572    }    }
# Line 630  Line 630 
630      struct stat buf;      struct stat buf;
631      if (stat(path, &buf) == 0) {      if (stat(path, &buf) == 0) {
632        /* it exists: merge */        /* it exists: merge */
633        FILE * f = fopen(path, "r");        FILE * f = fopen(path, "rb");
634        if (f == NULL) {        if (f == NULL) {
635          result = 1;          result = 1;
636        }        }
# Line 852  Line 852 
852      free(encoding);      free(encoding);
853      Stream_delete(input_stream);      Stream_delete(input_stream);
854      if (result == JSCOVERAGE_ERROR_ENCODING_NOT_SUPPORTED) {      if (result == JSCOVERAGE_ERROR_ENCODING_NOT_SUPPORTED) {
       free(characters);  
855        send_response(client_exchange, 502, "Encoding not supported\n");        send_response(client_exchange, 502, "Encoding not supported\n");
856        goto done;        goto done;
857      }      }
858      else if (result == JSCOVERAGE_ERROR_INVALID_BYTE_SEQUENCE) {      else if (result == JSCOVERAGE_ERROR_INVALID_BYTE_SEQUENCE) {
       free(characters);  
859        send_response(client_exchange, 502, "Error decoding response\n");        send_response(client_exchange, 502, "Error decoding response\n");
860        goto done;        goto done;
861      }      }
# Line 933  Line 931 
931    /* add the `Server' response-header (RFC 2616 14.38, 3.8) */    /* add the `Server' response-header (RFC 2616 14.38, 3.8) */
932    HTTPExchange_add_response_header(exchange, HTTP_SERVER, "jscoverage-server/" VERSION);    HTTPExchange_add_response_header(exchange, HTTP_SERVER, "jscoverage-server/" VERSION);
933    
934      char * decoded_path = NULL;
935    char * filesystem_path = NULL;    char * filesystem_path = NULL;
936    
937    const char * abs_path = HTTPExchange_get_abs_path(exchange);    const char * abs_path = HTTPExchange_get_abs_path(exchange);
938    assert(*abs_path != '\0');    assert(*abs_path != '\0');
939    
940    if (str_starts_with(abs_path, "/jscoverage")) {    decoded_path = decode_uri_component(abs_path);
941    
942      if (str_starts_with(decoded_path, "/jscoverage")) {
943      handle_jscoverage_request(exchange);      handle_jscoverage_request(exchange);
944      goto done;      goto done;
945    }    }
946    
947    if (strstr(abs_path, "..") != NULL) {    if (strstr(decoded_path, "..") != NULL) {
948      send_response(exchange, 403, "Forbidden\n");      send_response(exchange, 403, "Forbidden\n");
949      goto done;      goto done;
950    }    }
951    
952    filesystem_path = make_path(document_root, abs_path + 1);    filesystem_path = make_path(document_root, decoded_path + 1);
953    size_t filesystem_path_length = strlen(filesystem_path);    size_t filesystem_path_length = strlen(filesystem_path);
954    if (filesystem_path_length > 0 && filesystem_path[filesystem_path_length - 1] == '/') {    if (filesystem_path_length > 0 && filesystem_path[filesystem_path_length - 1] == '/') {
955      /* stat on Windows doesn't work with trailing slash */      /* stat on Windows doesn't work with trailing slash */
# Line 1015  Line 1016 
1016        Stream_delete(input_stream);        Stream_delete(input_stream);
1017    
1018        if (result == JSCOVERAGE_ERROR_ENCODING_NOT_SUPPORTED) {        if (result == JSCOVERAGE_ERROR_ENCODING_NOT_SUPPORTED) {
         free(characters);  
1019          send_response(exchange, 500, "Encoding not supported\n");          send_response(exchange, 500, "Encoding not supported\n");
1020          goto done;          goto done;
1021        }        }
1022        else if (result == JSCOVERAGE_ERROR_INVALID_BYTE_SEQUENCE) {        else if (result == JSCOVERAGE_ERROR_INVALID_BYTE_SEQUENCE) {
         free(characters);  
1023          send_response(exchange, 500, "Error decoding JavaScript file\n");          send_response(exchange, 500, "Error decoding JavaScript file\n");
1024          goto done;          goto done;
1025        }        }
# Line 1052  Line 1051 
1051    
1052  done:  done:
1053    free(filesystem_path);    free(filesystem_path);
1054      free(decoded_path);
1055  }  }
1056    
1057  static void handler(HTTPExchange * exchange) {  static void handler(HTTPExchange * exchange) {
# Line 1092  Line 1092 
1092      else if (strcmp(argv[i], "--report-dir") == 0) {      else if (strcmp(argv[i], "--report-dir") == 0) {
1093        i++;        i++;
1094        if (i == argc) {        if (i == argc) {
1095          fatal("--report-dir: option requires an argument");          fatal_command_line("--report-dir: option requires an argument");
1096        }        }
1097        report_directory = argv[i];        report_directory = argv[i];
1098      }      }
# Line 1103  Line 1103 
1103      else if (strcmp(argv[i], "--document-root") == 0) {      else if (strcmp(argv[i], "--document-root") == 0) {
1104        i++;        i++;
1105        if (i == argc) {        if (i == argc) {
1106          fatal("--document-root: option requires an argument");          fatal_command_line("--document-root: option requires an argument");
1107        }        }
1108        document_root = argv[i];        document_root = argv[i];
1109      }      }
# Line 1114  Line 1114 
1114      else if (strcmp(argv[i], "--encoding") == 0) {      else if (strcmp(argv[i], "--encoding") == 0) {
1115        i++;        i++;
1116        if (i == argc) {        if (i == argc) {
1117          fatal("--encoding: option requires an argument");          fatal_command_line("--encoding: option requires an argument");
1118        }        }
1119        jscoverage_encoding = argv[i];        jscoverage_encoding = argv[i];
1120      }      }
# Line 1125  Line 1125 
1125      else if (strcmp(argv[i], "--ip-address") == 0) {      else if (strcmp(argv[i], "--ip-address") == 0) {
1126        i++;        i++;
1127        if (i == argc) {        if (i == argc) {
1128          fatal("--ip-address: option requires an argument");          fatal_command_line("--ip-address: option requires an argument");
1129        }        }
1130        ip_address = argv[i];        ip_address = argv[i];
1131      }      }
# Line 1140  Line 1140 
1140      else if (strcmp(argv[i], "--no-instrument") == 0) {      else if (strcmp(argv[i], "--no-instrument") == 0) {
1141        i++;        i++;
1142        if (i == argc) {        if (i == argc) {
1143          fatal("--no-instrument: option requires an argument");          fatal_command_line("--no-instrument: option requires an argument");
1144        }        }
1145        no_instrument[num_no_instrument] = argv[i];        no_instrument[num_no_instrument] = argv[i];
1146        num_no_instrument++;        num_no_instrument++;
# Line 1153  Line 1153 
1153      else if (strcmp(argv[i], "--port") == 0) {      else if (strcmp(argv[i], "--port") == 0) {
1154        i++;        i++;
1155        if (i == argc) {        if (i == argc) {
1156          fatal("--port: option requires an argument");          fatal_command_line("--port: option requires an argument");
1157        }        }
1158        port = argv[i];        port = argv[i];
1159      }      }
# Line 1170  Line 1170 
1170      }      }
1171    
1172      else if (strncmp(argv[i], "-", 1) == 0) {      else if (strncmp(argv[i], "-", 1) == 0) {
1173        fatal("unrecognized option `%s'", argv[i]);        fatal_command_line("unrecognized option `%s'", argv[i]);
1174      }      }
1175      else {      else {
1176        fatal("too many arguments");        fatal_command_line("too many arguments");
1177      }      }
1178    }    }
1179    
# Line 1181  Line 1181 
1181    char * end;    char * end;
1182    unsigned long numeric_port = strtoul(port, &end, 10);    unsigned long numeric_port = strtoul(port, &end, 10);
1183    if (*end != '\0') {    if (*end != '\0') {
1184      fatal("--port: option must be an integer");      fatal_command_line("--port: option must be an integer");
1185    }    }
1186    if (numeric_port > UINT16_MAX) {    if (numeric_port > UINT16_MAX) {
1187      fatal("--port: option must be 16 bits");      fatal_command_line("--port: option must be 16 bits");
1188    }    }
1189    
1190    /* is this a shutdown? */    /* is this a shutdown? */

Legend:
Removed from v.189  
changed lines
  Added in v.275

  ViewVC Help
Powered by ViewVC 1.1.24