diff --git a/client/c b/client/c deleted file mode 100755 index 66e0411..0000000 Binary files a/client/c and /dev/null differ diff --git a/client/def.h b/client/def.h index dbc6cf3..6c6b331 100644 --- a/client/def.h +++ b/client/def.h @@ -12,5 +12,5 @@ void runtime_call(); void sync_client(); int sync_get(char *); void trans_client(); -void trans_c_send(char *name); +void trans_c_send(); void trans_c_get(); diff --git a/client/func/trans_client.c b/client/func/trans_client.c index 776525a..63b4414 100644 --- a/client/func/trans_client.c +++ b/client/func/trans_client.c @@ -3,31 +3,25 @@ void trans_client(){ a='2'; send(sockad,&a,1,0); char b; - char *name; - name=(char *)malloc(128*sizeof(char)); - memset(name,0,128*sizeof(char)); printf("send or get or quit?[S/G/Q]\n"); scanf("%c",&a); -// scanf("%c",&b); printf("a is %c\n",a); send(sockad,&a,1,0); for(;a!='Q'&&a!='q';){ if(a=='S'||a=='s'){ - printf("input the name of file:"); - scanf("%s",name); - printf("name is %s\n",name); - trans_c_send(name); + trans_c_send(); } else if(a=='G'||a=='g'){ trans_c_get(); } + scanf("%c",&b); printf("send or get or quit?[S/G/Q]\n"); scanf("%c",&a); -// scanf("%c",&b); + scanf("%c",&b); send(sockad,&a,1,0); printf("a is %c\n",a); @@ -37,9 +31,9 @@ void trans_client(){ } -void trans_c_send(char *name){ +void trans_c_send(){ printf("trans_c_send is running\n"); -// char *name; + char *name; char *s; int num_name; FILE *f; @@ -47,12 +41,12 @@ void trans_c_send(char *name){ char a; char b; -// name=(char *)malloc(sizeof(char)*128); + name=(char *)malloc(sizeof(char)*128); s=(char *)malloc(1024*sizeof(char)); -// memset(name,0,128*sizeof(char)); + memset(name,0,128*sizeof(char)); memset(s,0,1024*sizeof(char)); -// printf("input the name of file:"); -// scanf("%s",name); + printf("input the name of file:"); + scanf("%s",name); num_name=strlen(name); send(sockad,name,num_name,0); @@ -64,26 +58,29 @@ void trans_c_send(char *name){ *(s+num_text)=a; num_text++; a=fgetc(f); - if(num_text==1024){ - num_text=0; - b='a'; - printf("sending %s\n",s); - send(sockad,s,1024,0); - send(sockad,&b,1,0); - memset(s,0,1024*sizeof(char)); - } - else if(a==EOF){ + if(a==EOF){ b='Q'; printf("sending %s\n",s); send(sockad,s,num_text,0); - send(sockad,&b,1,0); +// send(sockad,&b,1,0); + } + else if(num_text==1024){ + b='A'; + printf("sending %s\n",s); + send(sockad,s,num_text,0); +// send(sockad,&b,1,0); + memset(s,0,1024*sizeof(char)); } - } fclose(f); free(s); + free(name); + printf("exit trans\n"); } + + + void trans_c_get(){ char *name; char *s; diff --git a/client/te b/client/te new file mode 100644 index 0000000..dcea85d --- /dev/null +++ b/client/te @@ -0,0 +1 @@ +ashdsdsbndsbdkjasbdkjasdbas diff --git a/server/func/sync_server.c b/server/func/sync_server.c index c391f34..44768ff 100644 --- a/server/func/sync_server.c +++ b/server/func/sync_server.c @@ -1,15 +1,12 @@ void sync_server(){ - FILE *f; int num; char a; char *s; s=(char *)malloc(1024*sizeof(char)); memset(s,0,1024*sizeof(char)); - f=fopen("text","r+"); for(;;){ num=recv(sockad,s,1024,0); s[num]='\0'; - fprintf(f,"%s",s); printf("get chars:%s\n",s); recv(sockad,&a,1,0); if(a=='N'||a=='n'){ @@ -18,5 +15,4 @@ void sync_server(){ memset(s,0,1024*sizeof(char)); } free(s); - fclose(f); } diff --git a/server/func/trans_server.c b/server/func/trans_server.c index 031ee47..ead4e19 100644 --- a/server/func/trans_server.c +++ b/server/func/trans_server.c @@ -13,6 +13,7 @@ void trans_server(){ } recv(sockad,&a,1,0); } + printf("exit trans_server\n"); } void trans_s_get(){ @@ -33,25 +34,23 @@ void trans_s_get(){ f=fopen(name,"w+"); -// fclose(f); -// f=fopen(name,"r+"); printf("opening text\n"); - for(;a!='Q'&&a!='q';){ - + for(;a!='q'&&a!='Q';){ num_s=recv(sockad,s,1024,0); +// recv(sockad,&a,1,0); + printf("get this chars:%s\n",s); +// printf("get a: %c\n",a); fprintf(f,"%s",s); memset(s,0,1024*sizeof(char)); - if(num_s!=1024){ - break; - } } printf("write done\n"); free(name); free(s); fclose(f); + printf("exit trans\n"); } void trans_s_send(){ diff --git a/server/s b/server/s deleted file mode 100755 index 2deab82..0000000 Binary files a/server/s and /dev/null differ diff --git a/server/text b/server/text deleted file mode 100644 index 12b8e26..0000000 --- a/server/text +++ /dev/null @@ -1,72 +0,0 @@ -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsdjfnsdf -123456snfdnfsdf -sdfndnkjsdfsdf -sdfsa \ No newline at end of file