| 1 |
anssi |
217426 |
Description: Fix build errors. |
| 2 |
|
|
Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/afpfs-ng.git;a=blob;f=debian/patches/build-error-fixes.patch |
| 3 |
|
|
|
| 4 |
|
|
--- a/lib/afp_url.c |
| 5 |
|
|
+++ b/lib/afp_url.c |
| 6 |
|
|
@@ -233,7 +233,7 @@ |
| 7 |
|
|
} |
| 8 |
|
|
} |
| 9 |
|
|
|
| 10 |
|
|
- snprintf(url->servername,strlen(p)+1,p); |
| 11 |
|
|
+ strcpy(url->servername,p); |
| 12 |
|
|
if (check_servername(url->servername)) { |
| 13 |
|
|
if (verbose) printf("This isn't a valid servername\n"); |
| 14 |
|
|
return -1; |
| 15 |
|
|
@@ -263,7 +263,7 @@ |
| 16 |
|
|
if ((q=escape_strrchr(p,':',":"))) { |
| 17 |
|
|
*q='\0'; |
| 18 |
|
|
q++; |
| 19 |
|
|
- snprintf(url->password,strlen(q)+1,q); |
| 20 |
|
|
+ strcpy(url->password,q); |
| 21 |
|
|
if (check_password(url->password)) { |
| 22 |
|
|
if (verbose) printf("This isn't a valid passwd\n"); |
| 23 |
|
|
return -1; |
| 24 |
|
|
@@ -276,7 +276,7 @@ |
| 25 |
|
|
if ((q=strstr(p,";AUTH="))) { |
| 26 |
|
|
*q='\0'; |
| 27 |
|
|
q+=6; |
| 28 |
|
|
- snprintf(url->uamname,strlen(q)+1,q); |
| 29 |
|
|
+ strcpy(url->uamname,q); |
| 30 |
|
|
if (check_uamname(url->uamname)) { |
| 31 |
|
|
if (verbose) printf("This isn't a valid uamname\n"); |
| 32 |
|
|
return -1; |
| 33 |
|
|
@@ -284,7 +284,7 @@ |
| 34 |
|
|
} |
| 35 |
|
|
|
| 36 |
|
|
if (strlen(p)>0) { |
| 37 |
|
|
- snprintf(url->username,strlen(p)+1,p); |
| 38 |
|
|
+ strcpy(url->username,p); |
| 39 |
|
|
if (check_username(url->username)) { |
| 40 |
|
|
if (verbose) printf("This isn't a valid username\n"); |
| 41 |
|
|
return -1;; |
| 42 |
|
|
@@ -304,12 +304,12 @@ |
| 43 |
|
|
*q='\0'; |
| 44 |
|
|
q++; |
| 45 |
|
|
} |
| 46 |
|
|
- snprintf(url->volumename,strlen(p)+1,p); |
| 47 |
|
|
+ strcpy(url->volumename,p); |
| 48 |
|
|
|
| 49 |
|
|
|
| 50 |
|
|
if (q) { |
| 51 |
|
|
url->path[0]='/'; |
| 52 |
|
|
- snprintf(url->path+1,strlen(q)+1,q); |
| 53 |
|
|
+ strcpy(url->path+1,q); |
| 54 |
|
|
} |
| 55 |
|
|
|
| 56 |
|
|
done: |
| 57 |
|
|
--- a/fuse/commands.c |
| 58 |
|
|
+++ b/fuse/commands.c |
| 59 |
|
|
@@ -163,8 +163,7 @@ |
| 60 |
|
|
|
| 61 |
|
|
if (c) { |
| 62 |
|
|
len = strlen(c->client_string); |
| 63 |
|
|
- snprintf(c->client_string+len, |
| 64 |
|
|
- MAX_CLIENT_RESPONSE-len, |
| 65 |
|
|
+ strcpy(c->client_string+len, |
| 66 |
|
|
message); |
| 67 |
|
|
} else { |
| 68 |
|
|
|
| 69 |
|
|
@@ -468,7 +467,7 @@ |
| 70 |
|
|
volume->mapping=req->map; |
| 71 |
|
|
afp_detect_mapping(volume); |
| 72 |
|
|
|
| 73 |
|
|
- snprintf(volume->mountpoint,255,req->mountpoint); |
| 74 |
|
|
+ strcpy(volume->mountpoint,req->mountpoint); |
| 75 |
|
|
|
| 76 |
|
|
/* Create the new thread and block until we get an answer back */ |
| 77 |
|
|
{ |
| 78 |
|
|
--- a/fuse/client.c |
| 79 |
|
|
+++ b/fuse/client.c |
| 80 |
|
|
@@ -547,7 +547,7 @@ |
| 81 |
|
|
done: |
| 82 |
|
|
memset(toprint,0,MAX_CLIENT_RESPONSE+200); |
| 83 |
|
|
snprintf(toprint,MAX_CLIENT_RESPONSE+200,"%s",incoming_buffer+sizeof(*answer)); |
| 84 |
|
|
- printf(toprint); |
| 85 |
|
|
+ printf("%s",toprint); |
| 86 |
|
|
return ((struct afp_server_response *) incoming_buffer)->result; |
| 87 |
|
|
|
| 88 |
|
|
return 0; |
| 89 |
|
|
--- a/cmdline/cmdline_afp.c |
| 90 |
|
|
+++ b/cmdline/cmdline_afp.c |
| 91 |
|
|
@@ -828,11 +828,11 @@ |
| 92 |
|
|
char text[40960]; |
| 93 |
|
|
|
| 94 |
|
|
afp_status_header(text,&len); |
| 95 |
|
|
- printf(text); |
| 96 |
|
|
+ printf("%s",text); |
| 97 |
|
|
|
| 98 |
|
|
len=40960; |
| 99 |
|
|
afp_status_server(server,text,&len); |
| 100 |
|
|
- printf(text); |
| 101 |
|
|
+ printf("%s",text); |
| 102 |
|
|
return 0; |
| 103 |
|
|
} |
| 104 |
|
|
|
| 105 |
|
|
--- a/cmdline/cmdline_testafp.c |
| 106 |
|
|
+++ b/cmdline/cmdline_testafp.c |
| 107 |
|
|
@@ -26,12 +26,12 @@ |
| 108 |
|
|
struct afp_url valid_url; |
| 109 |
|
|
afp_default_url(&valid_url); |
| 110 |
|
|
valid_url.protocol=protocol; |
| 111 |
|
|
- sprintf(valid_url.servername,servername); |
| 112 |
|
|
- sprintf(valid_url.volumename,volumename); |
| 113 |
|
|
- sprintf(valid_url.path,path); |
| 114 |
|
|
- sprintf(valid_url.username,username); |
| 115 |
|
|
- sprintf(valid_url.password,password); |
| 116 |
|
|
- sprintf(valid_url.uamname,uamname); |
| 117 |
|
|
+ strcpy(valid_url.servername,servername); |
| 118 |
|
|
+ strcpy(valid_url.volumename,volumename); |
| 119 |
|
|
+ strcpy(valid_url.path,path); |
| 120 |
|
|
+ strcpy(valid_url.username,username); |
| 121 |
|
|
+ strcpy(valid_url.password,password); |
| 122 |
|
|
+ strcpy(valid_url.uamname,uamname); |
| 123 |
|
|
valid_url.port=port; |
| 124 |
|
|
|
| 125 |
|
|
if (afp_url_validate(url_string,&valid_url)) |
Parent Directory
| 
Revision Log