recherche fichier ok

webserver/client.c

@@ -15,8 +15,10 @@
 int copy(FILE* in, FILE* out){
 	int ch;
 	if(in && out){
-		while((ch =( fgetc(in))!= EOF) ){
+		ch = fgetc(in);
+		while(ch != EOF ){
 			fputc(ch,out);
+			ch=fgetc(in);
 		}
 	}else{
 	//error reading
@@ -35,22 +37,32 @@ int get_file_size(int fd){
 }
 
 FILE* check_and_open(const char* target, const char *document_root){
-	char*tmp="";
+	printf("check and open test\n");
+	char tmp[300]="";
 	strcat(tmp,target);
 	strcat(tmp,"/");
 	strcat(tmp,document_root);
+
+	printf("testons");
+	printf("check and open tmp : %s/%s \n tmp : %s \n",target,document_root,tmp);
 	return fopen(tmp,"r");
 }
 
 char* rewrite_target(char *target){
 	char* ret = strrchr(target, '?');
-	char* rep = malloc(strlen(target)*sizeof(char));
+	printf("rewrite target ret : %s\n",ret);
 	if(ret != NULL){
+		char* rep = malloc(strlen(target)*sizeof(char));
 		size_t i = (int)(strlen(target)-strlen(ret));
-	    rep = strncpy(rep,target,i);
-    }
+		rep = strncpy(rep,target+1,i-1);
+		return rep;
+	}else{
+		char* rep = malloc(strlen(target)*sizeof(char));
+                size_t i = (int)(strlen(target));
+                rep = strncpy(rep,target+1,i);
 		return rep;
 	}
+}
 
 
 char* fgets_or_exit(char * buffer, int size, FILE *fd){
@@ -99,13 +111,13 @@ void send_response(FILE *client, int code, const char *reason_phrase, const char
 int traitementClient(int socket_client){
 	/* On peut maintenant dialoguer avec le client */
 	char *motd="Votre requète est bonne";
-	printf("test");
+	printf("test\n");
 	char str[8000];
 	http_request request;
 	FILE *fd;
 	fd = fdopen(socket_client, "a+");
 	if(fd == NULL) {
-		perror("Error opening file");
+		perror("Error opening file\n");
 		exit(1);
 	}
     //fprintf(fd,"pas d'erreurs d'ouverture\n");
@@ -118,7 +130,7 @@ int traitementClient(int socket_client){
 		}else{
 			send_response(fd, 400, "Bad Request", "Bad request");
 		}
-	}else if (strcmp(request.target, "/test?aled") == 0){
+	}else if (strcmp(request.target, "/") == 0){
 		send_response(fd, 200, "OK", motd);
 	//---
 	}else{
@@ -128,16 +140,18 @@ int traitementClient(int socket_client){
 	//partie 7
 	char* absolute_path = rewrite_target(request.target);
 	printf("test - - -  - - - - - %s\n",absolute_path);
+
 	FILE* fichier = check_and_open(absolute_path, "document.txt");
+	fprintf(fd,"fichier : \n");
         if(fichier == NULL){
-                send_response(fd, 404, "Not Found", "Not Found");
-        }
+                send_response(fd, 404, "Not Found2", "Not Found2");
+        }else{
         	int size = get_file_size(fileno(fichier));
         	if(copy(fichier,fd)==-1){
                 //error
         	}
-	fprintf(fd,"Size : %d",size);
-
+		fprintf(fd,"Size : %d\n",size);
+	}
 	fclose(fd);
     	return 0;
 }

webserver/test → webserver/document.txt

 testons
+le
+fopen

webserver/test/document.txt

+testons
+le
+fopen