annotate lib/rfc959.c @ 15:82fabd6ef1c4

FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
author masneyb
date Wed, 04 Sep 2002 13:02:15 +0000
parents 83090328581e
children c8ec7877432e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1 /*****************************************************************************/
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
2 /* rfc959.c - General purpose routines for the FTP protocol (RFC 959) */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
3 /* Copyright (C) 1998-2002 Brian Masney <masneyb@gftp.org> */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
4 /* */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
5 /* This program is free software; you can redistribute it and/or modify */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
6 /* it under the terms of the GNU General Public License as published by */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
7 /* the Free Software Foundation; either version 2 of the License, or */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
8 /* (at your option) any later version. */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
9 /* */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
10 /* This program is distributed in the hope that it will be useful, */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
11 /* but WITHOUT ANY WARRANTY; without even the implied warranty of */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
12 /* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
13 /* GNU General Public License for more details. */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
14 /* */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
15 /* You should have received a copy of the GNU General Public License */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
16 /* along with this program; if not, write to the Free Software */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
17 /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
18 /*****************************************************************************/
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
19
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
20 #include "gftp.h"
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
21
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
22 static int rfc959_connect ( gftp_request * request );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
23 static void rfc959_disconnect ( gftp_request * request );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
24 static long rfc959_get_file ( gftp_request * request,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
25 const char *filename,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
26 FILE * fd,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
27 off_t startsize );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
28 static int rfc959_put_file ( gftp_request * request,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
29 const char *filename,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
30 FILE * fd,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
31 off_t startsize,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
32 off_t totalsize );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
33 static long rfc959_transfer_file ( gftp_request *fromreq,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
34 const char *fromfile,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
35 off_t fromsize,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
36 gftp_request *toreq,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
37 const char *tofile,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
38 off_t tosize );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
39 static int rfc959_end_transfer ( gftp_request * request );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
40 static int rfc959_list_files ( gftp_request * request );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
41 static int rfc959_set_data_type ( gftp_request * request,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
42 int data_type );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
43 static off_t rfc959_get_file_size ( gftp_request * request,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
44 const char *filename );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
45 static int rfc959_data_connection_new ( gftp_request * request );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
46 static int rfc959_accept_active_connection ( gftp_request * request );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
47 static int rfc959_send_command ( gftp_request * request,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
48 const char *command );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
49 static int write_to_socket ( gftp_request *request,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
50 const char *command );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
51 static int rfc959_read_response ( gftp_request * request );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
52 static int rfc959_chdir ( gftp_request * request,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
53 const char *directory );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
54 static int rfc959_rmdir ( gftp_request * request,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
55 const char *directory );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
56 static int rfc959_rmfile ( gftp_request * request,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
57 const char *file );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
58 static int rfc959_mkdir ( gftp_request * request,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
59 const char *directory );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
60 static int rfc959_rename ( gftp_request * request,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
61 const char *oldname,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
62 const char *newname );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
63 static int rfc959_chmod ( gftp_request * request,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
64 const char *file,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
65 int mode );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
66 static int rfc959_site ( gftp_request * request,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
67 const char *command );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
68 static char *parse_ftp_proxy_string ( gftp_request * request );
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
69
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
70 void
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
71 rfc959_init (gftp_request * request)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
72 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
73 g_return_if_fail (request != NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
74
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
75 request->protonum = GFTP_FTP_NUM;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
76 request->init = rfc959_init;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
77 request->destroy = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
78 request->connect = rfc959_connect;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
79 request->disconnect = rfc959_disconnect;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
80 request->get_file = rfc959_get_file;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
81 request->put_file = rfc959_put_file;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
82 request->transfer_file = rfc959_transfer_file;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
83 request->get_next_file_chunk = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
84 request->put_next_file_chunk = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
85 request->end_transfer = rfc959_end_transfer;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
86 request->list_files = rfc959_list_files;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
87 request->get_next_file = rfc959_get_next_file;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
88 request->set_data_type = rfc959_set_data_type;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
89 request->get_file_size = rfc959_get_file_size;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
90 request->chdir = rfc959_chdir;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
91 request->rmdir = rfc959_rmdir;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
92 request->rmfile = rfc959_rmfile;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
93 request->mkdir = rfc959_mkdir;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
94 request->rename = rfc959_rename;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
95 request->chmod = rfc959_chmod;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
96 request->set_file_time = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
97 request->site = rfc959_site;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
98 request->parse_url = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
99 request->url_prefix = "ftp";
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
100 request->protocol_name = "FTP";
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
101 request->need_hostport = 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
102 request->need_userpass = 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
103 request->use_cache = 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
104 request->use_threads = 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
105 request->always_connected = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
106 gftp_set_config_options (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
107 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
108
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
109
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
110 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
111 rfc959_connect (gftp_request * request)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
112 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
113 char tempchar, *startpos, *endpos, *tempstr, *dir;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
114 int sock, ret, resp;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
115
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
116 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
117 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
118 g_return_val_if_fail (request->hostname != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
119
7
5551ab2301fe * Fixed a DND crash
masneyb
parents: 1
diff changeset
120 if (request->username == NULL || *request->username == '\0')
5551ab2301fe * Fixed a DND crash
masneyb
parents: 1
diff changeset
121 {
5551ab2301fe * Fixed a DND crash
masneyb
parents: 1
diff changeset
122 gftp_set_username (request, "anonymous");
5551ab2301fe * Fixed a DND crash
masneyb
parents: 1
diff changeset
123 gftp_set_password (request, emailaddr);
5551ab2301fe * Fixed a DND crash
masneyb
parents: 1
diff changeset
124 }
5551ab2301fe * Fixed a DND crash
masneyb
parents: 1
diff changeset
125 else if (strcasecmp (request->username, "anonymous") == 0)
5551ab2301fe * Fixed a DND crash
masneyb
parents: 1
diff changeset
126 gftp_set_password (request, emailaddr);
5551ab2301fe * Fixed a DND crash
masneyb
parents: 1
diff changeset
127
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
128 if (request->sockfd != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
129 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
130
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
131 if ((sock = gftp_connect_server (request, "ftp")) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
132 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
133
14
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 7
diff changeset
134 if ((request->sockfd = fdopen (sock, "rb+")) == NULL)
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
135 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
136 request->logging_function (gftp_logging_error, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
137 _("Cannot fdopen() socket: %s\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
138 g_strerror (errno));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
139 close (sock);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
140 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
141 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
142
14
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 7
diff changeset
143 if ((request->sockfd_write = fdopen (dup (sock), "wb+")) == NULL)
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
144 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
145 request->logging_function (gftp_logging_error, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
146 _("Cannot fdopen() socket: %s\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
147 g_strerror (errno));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
148 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
149 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
150 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
151
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
152 /* Get the banner */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
153 if (rfc959_read_response (request) != '2')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
154 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
155 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
156 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
157 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
158
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
159 /* Login the proxy server if available */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
160 if (request->use_proxy)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
161 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
162 resp = '3';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
163 startpos = endpos = tempstr = parse_ftp_proxy_string (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
164 while ((resp == '3' || resp == '2') && *startpos != '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
165 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
166 if (*endpos == '\n' || *endpos == '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
167 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
168 tempchar = *(endpos + 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
169 if (*endpos != '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
170 *(endpos + 1) = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
171 if ((resp = rfc959_send_command (request, startpos)) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
172 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
173 if (*endpos != '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
174 *(endpos + 1) = tempchar;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
175 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
176 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
177 startpos = endpos + 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
178 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
179 endpos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
180 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
181 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
182 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
183 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
184 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
185 tempstr = g_strconcat ("USER ", request->username, "\r\n", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
186 resp = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
187 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
188 if (resp < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
189 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
190 if (resp == '3')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
191 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
192 tempstr = g_strconcat ("PASS ", request->password, "\r\n", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
193 resp = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
194 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
195 if (resp < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
196 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
197 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
198 if (resp == '3' && request->account)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
199 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
200 tempstr = g_strconcat ("ACCT ", request->account, "\r\n", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
201 resp = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
202 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
203 if (resp < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
204 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
205 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
206 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
207
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
208 if (resp != '2')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
209 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
210 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
211 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
212 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
213
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
214 if (request->data_type == GFTP_TYPE_BINARY)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
215 tempstr = "TYPE I\r\n";
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
216 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
217 tempstr = "TYPE A\r\n";
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
218
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
219 if (rfc959_send_command (request, tempstr) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
220 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
221
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
222 ret = -1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
223 if (request->directory != NULL && *request->directory != '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
224 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
225 ret = rfc959_chdir (request, request->directory);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
226 if (request->sockfd == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
227 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
228 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
229
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
230 if (ret != 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
231 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
232 if (rfc959_send_command (request, "PWD\r\n") != '2' ||
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
233 request->sockfd == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
234 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
235 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
236 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
237 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
238
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
239 if ((tempstr = strchr (request->last_ftp_response, '"')) == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
240 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
241 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
242 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
243 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
244 dir = tempstr + 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
245
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
246 if ((tempstr = strchr (dir, '"')) == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
247 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
248 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
249 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
250 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
251 if (tempstr != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
252 *tempstr = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
253
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
254 request->directory = g_malloc (strlen (dir) + 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
255 strcpy (request->directory, dir);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
256 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
257
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
258 if (request->sockfd == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
259 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
260
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
261 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
262 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
263
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
264
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
265 static void
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
266 rfc959_disconnect (gftp_request * request)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
267 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
268 g_return_if_fail (request != NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
269 g_return_if_fail (request->protonum == GFTP_FTP_NUM);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
270
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
271 if (request->sockfd != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
272 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
273 request->logging_function (gftp_logging_misc, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
274 _("Disconnecting from site %s\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
275 request->hostname);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
276 fclose (request->sockfd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
277 fclose (request->sockfd_write);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
278 request->sockfd = request->sockfd_write = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
279 if (request->datafd)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
280 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
281 fclose (request->datafd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
282 request->datafd = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
283 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
284 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
285 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
286
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
287
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
288 static long
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
289 rfc959_get_file (gftp_request * request, const char *filename, FILE * fd,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
290 off_t startsize)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
291 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
292 char *command, *tempstr, resp;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
293 int ret, flags;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
294
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
295 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
296 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
297 g_return_val_if_fail (filename != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
298 g_return_val_if_fail (request->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
299
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
300 if (fd != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
301 request->datafd = fd;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
302
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
303 if (request->datafd == NULL &&
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
304 (ret = rfc959_data_connection_new (request)) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
305 return (ret);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
306
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
307 flags = fcntl (fileno (request->datafd), F_GETFL, 0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
308 if (fcntl (fileno (request->datafd), F_SETFL, flags | O_NONBLOCK) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
309 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
310 fclose (request->datafd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
311 request->datafd = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
312 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
313 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
314
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
315 if (startsize > 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
316 {
14
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 7
diff changeset
317 #if defined (_LARGEFILE_SOURCE)
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 7
diff changeset
318 command = g_strdup_printf ("REST %lld\r\n", startsize);
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 7
diff changeset
319 #else
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
320 command = g_strdup_printf ("REST %ld\r\n", startsize);
14
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 7
diff changeset
321 #endif
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
322 resp = rfc959_send_command (request, command);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
323 g_free (command);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
324
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
325 if (resp != '3')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
326 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
327 fclose (request->datafd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
328 request->datafd = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
329 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
330 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
331 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
332
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
333 tempstr = g_strconcat ("RETR ", filename, "\r\n", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
334 ret = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
335 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
336
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
337 if (ret != '1')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
338 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
339 fclose (request->datafd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
340 request->datafd = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
341 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
342 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
343
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
344 if (request->transfer_type == gftp_transfer_active &&
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
345 (ret = rfc959_accept_active_connection (request)) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
346 return (ret);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
347
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
348 if ((tempstr = strrchr (request->last_ftp_response, '(')) == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
349 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
350 tempstr = request->last_ftp_response + 4;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
351 while (!isdigit ((int) *tempstr) && *tempstr != '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
352 tempstr++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
353 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
354 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
355 tempstr++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
356
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
357 return (strtol (tempstr, NULL, 10) + startsize);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
358 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
359
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
360
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
361 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
362 rfc959_put_file (gftp_request * request, const char *filename, FILE * fd,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
363 off_t startsize, off_t totalsize)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
364 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
365 char *command, *tempstr, resp;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
366 int ret, flags;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
367
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
368 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
369 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
370 g_return_val_if_fail (filename != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
371 g_return_val_if_fail (request->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
372
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
373 if (fd != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
374 fd = request->datafd;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
375
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
376 if (request->datafd == NULL &&
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
377 (ret = rfc959_data_connection_new (request)) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
378 return (ret);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
379
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
380 flags = fcntl (fileno (request->datafd), F_GETFL, 0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
381 if (fcntl (fileno (request->datafd), F_SETFL, flags | O_NONBLOCK) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
382 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
383 fclose (request->datafd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
384 request->datafd = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
385 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
386 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
387
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
388 if (startsize > 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
389 {
14
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 7
diff changeset
390 #if defined (_LARGEFILE_SOURCE)
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 7
diff changeset
391 command = g_strdup_printf ("REST %lld\r\n", startsize);
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 7
diff changeset
392 #else
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 7
diff changeset
393 command = g_strdup_printf ("REST %ld\r\n", startsize);
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 7
diff changeset
394 #endif
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
395 resp = rfc959_send_command (request, command);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
396 g_free (command);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
397 if (resp != '3')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
398 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
399 fclose (request->datafd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
400 request->datafd = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
401 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
402 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
403 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
404
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
405 tempstr = g_strconcat ("STOR ", filename, "\r\n", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
406 ret = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
407 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
408 if (ret != '1')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
409 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
410 fclose (request->datafd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
411 request->datafd = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
412 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
413 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
414
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
415 if (request->transfer_type == gftp_transfer_active &&
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
416 (ret = rfc959_accept_active_connection (request)) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
417 return (ret);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
418
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
419 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
420 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
421
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
422 static long
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
423 rfc959_transfer_file (gftp_request *fromreq, const char *fromfile,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
424 off_t fromsize, gftp_request *toreq,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
425 const char *tofile, off_t tosize)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
426 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
427 char *tempstr, *pos, *endpos;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
428
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
429 g_return_val_if_fail (fromreq != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
430 g_return_val_if_fail (fromfile != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
431 g_return_val_if_fail (toreq != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
432 g_return_val_if_fail (tofile != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
433 g_return_val_if_fail (fromreq->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
434 g_return_val_if_fail (toreq->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
435
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
436 fromreq->transfer_type = gftp_transfer_passive;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
437 toreq->transfer_type = gftp_transfer_active;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
438
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
439 if (rfc959_send_command (fromreq, "PASV\r\n") != '2' ||
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
440 fromreq->sockfd == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
441 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
442
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
443 pos = fromreq->last_ftp_response + 4;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
444 while (!isdigit ((int) *pos) && *pos != '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
445 pos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
446 if (*pos == '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
447 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
448
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
449 endpos = pos;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
450 while (*endpos != ')' && *endpos != '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
451 endpos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
452 if (*endpos == ')')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
453 *endpos = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
454
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
455 tempstr = g_strconcat ("PORT ", pos, "\r\n", NULL);
15
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
456 if (rfc959_send_command (toreq, tempstr) != '2')
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
457 {
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
458 g_free (tempstr);
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
459 return (-2);
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
460 }
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
461 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
462
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
463 tempstr = g_strconcat ("RETR ", fromfile, "\r\n", NULL);
15
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
464 if (write_to_socket (fromreq, tempstr) < 0)
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
465 {
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
466 g_free (tempstr);
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
467 return (-2);
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
468 }
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
469 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
470
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
471 tempstr = g_strconcat ("STOR ", tofile, "\r\n", NULL);
15
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
472 if (write_to_socket (toreq, tempstr) < 0)
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
473 {
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
474 g_free (tempstr);
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
475 return (-2);
82fabd6ef1c4 FXP fixes (from Tobias Gruetzmacher <tobias@portfolio16.de>)
masneyb
parents: 14
diff changeset
476 }
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
477 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
478
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
479 if (rfc959_read_response (fromreq) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
480 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
481 if (rfc959_read_response (toreq) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
482 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
483
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
484 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
485 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
486
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
487
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
488 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
489 rfc959_end_transfer (gftp_request * request)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
490 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
491 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
492 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
493 g_return_val_if_fail (request->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
494
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
495 if (request->datafd)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
496 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
497 fclose (request->datafd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
498 request->datafd = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
499 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
500 return (rfc959_read_response (request) == '2' ? 0 : -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
501 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
502
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
503
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
504 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
505 rfc959_list_files (gftp_request * request)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
506 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
507 char *tempstr, parms[3];
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
508 int ret;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
509
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
510 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
511 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
512 g_return_val_if_fail (request->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
513
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
514 if ((ret = rfc959_data_connection_new (request)) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
515 return (ret);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
516
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
517 *parms = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
518 strcat (parms, show_hidden_files ? "a" : "");
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
519 strcat (parms, resolve_symlinks ? "L" : "");
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
520 tempstr = g_strconcat ("LIST", *parms != '\0' ? " -" : "", parms, "\r\n",
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
521 NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
522
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
523 ret = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
524 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
525
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
526 if (ret != '1')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
527 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
528
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
529 ret = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
530 if (request->transfer_type == gftp_transfer_active)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
531 ret = rfc959_accept_active_connection (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
532
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
533 return (ret);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
534 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
535
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
536
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
537 int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
538 rfc959_get_next_file (gftp_request * request, gftp_file * fle, FILE * fd)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
539 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
540 char tempstr[255];
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
541 size_t len;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
542
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
543 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
544 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
545 g_return_val_if_fail (fle != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
546 g_return_val_if_fail (fd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
547
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
548 if (request->last_dir_entry)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
549 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
550 g_free (request->last_dir_entry);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
551 request->last_dir_entry = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
552 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
553 do
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
554 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
555 /* I don't run select() here because select could return
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
556 successfully saying there is data, but the fgets call could block if
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
557 there is no carriage return */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
558 if (!fgets (tempstr, sizeof (tempstr), fd))
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
559 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
560 gftp_file_destroy (fle);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
561 if (ferror (fd))
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
562 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
563 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
564 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
565 tempstr[sizeof (tempstr) - 1] = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
566
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
567 if (gftp_parse_ls (tempstr, fle) != 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
568 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
569 if (strncmp (tempstr, "total", strlen("total")) != 0 &&
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
570 strncmp (tempstr, _("total"), strlen(_("total"))) != 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
571 request->logging_function (gftp_logging_misc, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
572 _("Warning: Cannot parse listing %s\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
573 tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
574 gftp_file_destroy (fle);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
575 continue;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
576 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
577 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
578 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
579 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
580 while (1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
581
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
582 len = strlen (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
583 if (!request->cached)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
584 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
585 request->last_dir_entry = g_malloc (len + 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
586 strcpy (request->last_dir_entry, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
587 request->last_dir_entry_len = len;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
588 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
589 return (len);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
590 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
591
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
592
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
593 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
594 rfc959_set_data_type (gftp_request * request, int data_type)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
595 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
596 char *tempstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
597
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
598 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
599 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
600
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
601 if (request->sockfd != NULL && request->data_type != data_type)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
602 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
603 if (data_type == GFTP_TYPE_BINARY)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
604 tempstr = "TYPE I\r\n";
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
605 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
606 tempstr = "TYPE A\r\n";
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
607
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
608 if (rfc959_send_command (request, tempstr) != '2')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
609 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
610 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
611 request->data_type = data_type;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
612 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
613 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
614
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
615
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
616 static off_t
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
617 rfc959_get_file_size (gftp_request * request, const char *filename)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
618 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
619 char *tempstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
620 int ret;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
621
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
622 g_return_val_if_fail (request != NULL, 0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
623 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
624 g_return_val_if_fail (filename != NULL, 0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
625 g_return_val_if_fail (request->sockfd != NULL, 0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
626
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
627 tempstr = g_strconcat ("SIZE ", filename, "\r\n", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
628 ret = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
629 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
630 if (ret < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
631 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
632
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
633 if (*request->last_ftp_response != '2')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
634 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
635 return (strtol (request->last_ftp_response + 4, NULL, 10));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
636 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
637
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
638
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
639 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
640 rfc959_data_connection_new (gftp_request * request)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
641 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
642 char *pos, *pos1, resp, *command;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
643 struct sockaddr_in data_addr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
644 size_t data_addr_len;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
645 unsigned int temp[6];
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
646 unsigned char ad[6];
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
647 int i, sock;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
648
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
649 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
650 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
651 g_return_val_if_fail (request->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
652
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
653 if ((sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
654 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
655 request->logging_function (gftp_logging_error, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
656 _("Failed to create a socket: %s\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
657 g_strerror (errno));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
658 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
659 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
660 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
661
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
662 data_addr_len = sizeof (data_addr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
663 memset (&data_addr, 0, data_addr_len);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
664 data_addr.sin_family = AF_INET;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
665
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
666 if (request->transfer_type == gftp_transfer_passive)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
667 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
668 if ((resp = rfc959_send_command (request, "PASV\r\n")) != '2')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
669 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
670 if (request->sockfd == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
671 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
672
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
673 request->transfer_type = gftp_transfer_active;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
674 return (rfc959_data_connection_new (request));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
675 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
676 pos = request->last_ftp_response + 4;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
677 while (!isdigit ((int) *pos) && *pos != '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
678 pos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
679 if (*pos == '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
680 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
681 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
682 close (sock);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
683 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
684 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
685 if (sscanf (pos, "%u,%u,%u,%u,%u,%u", &temp[0], &temp[1], &temp[2],
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
686 &temp[3], &temp[4], &temp[5]) != 6)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
687 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
688 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
689 close (sock);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
690 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
691 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
692 for (i = 0; i < 6; i++)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
693 ad[i] = (unsigned char) (temp[i] & 0xff);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
694
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
695 memcpy (&data_addr.sin_addr, &ad[0], 4);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
696 memcpy (&data_addr.sin_port, &ad[4], 2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
697 if (connect (sock, (struct sockaddr *) &data_addr, data_addr_len) == -1)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
698 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
699 request->logging_function (gftp_logging_error, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
700 _("Cannot create a data connection: %s\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
701 g_strerror (errno));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
702 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
703 close (sock);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
704 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
705 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
706 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
707 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
708 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
709 getsockname (fileno (request->sockfd), (struct sockaddr *) &data_addr,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
710 &data_addr_len);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
711 data_addr.sin_port = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
712 if (bind (sock, (struct sockaddr *) &data_addr, data_addr_len) == -1)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
713 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
714 request->logging_function (gftp_logging_error, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
715 _("Cannot bind a port: %s\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
716 g_strerror (errno));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
717 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
718 close (sock);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
719 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
720 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
721
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
722 getsockname (sock, (struct sockaddr *) &data_addr, &data_addr_len);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
723 if (listen (sock, 1) == -1)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
724 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
725 request->logging_function (gftp_logging_error, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
726 _("Cannot listen on port %d: %s\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
727 ntohs (data_addr.sin_port),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
728 g_strerror (errno));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
729 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
730 close (sock);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
731 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
732 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
733 pos = (char *) &data_addr.sin_addr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
734 pos1 = (char *) &data_addr.sin_port;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
735 command = g_strdup_printf ("PORT %u,%u,%u,%u,%u,%u\r\n",
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
736 pos[0] & 0xff, pos[1] & 0xff, pos[2] & 0xff,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
737 pos[3] & 0xff, pos1[0] & 0xff,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
738 pos1[1] & 0xff);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
739 resp = rfc959_send_command (request, command);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
740 g_free (command);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
741 if (resp != '2')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
742 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
743 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
744 close (sock);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
745 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
746 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
747 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
748
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
749 if ((request->datafd = fdopen (sock, "rb+")) == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
750 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
751 request->logging_function (gftp_logging_error, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
752 _("Cannot fdopen() socket: %s\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
753 g_strerror (errno));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
754 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
755 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
756 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
757
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
758 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
759 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
760
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
761
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
762 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
763 rfc959_accept_active_connection (gftp_request * request)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
764 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
765 struct sockaddr_in cli_addr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
766 size_t cli_addr_len;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
767 int infd;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
768
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
769 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
770 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
771 g_return_val_if_fail (request->datafd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
772 g_return_val_if_fail (request->transfer_type == gftp_transfer_active, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
773
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
774 cli_addr_len = sizeof (cli_addr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
775 if ((infd = accept (fileno (request->datafd), (struct sockaddr *) &cli_addr,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
776 &cli_addr_len)) == -1)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
777 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
778 request->logging_function (gftp_logging_error, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
779 _("Cannot accept connection from server: %s\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
780 g_strerror (errno));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
781 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
782 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
783 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
784
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
785 fclose (request->datafd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
786
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
787 if ((request->datafd = fdopen (infd, "rb+")) == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
788 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
789 request->logging_function (gftp_logging_error, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
790 _("Cannot fdopen() socket: %s\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
791 g_strerror (errno));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
792 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
793 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
794 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
795 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
796 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
797
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
798
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
799 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
800 rfc959_send_command (gftp_request * request, const char *command)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
801 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
802 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
803 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
804 g_return_val_if_fail (command != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
805 g_return_val_if_fail (request->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
806
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
807 if (strncmp (command, "PASS", 4) == 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
808 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
809 request->logging_function (gftp_logging_send, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
810 "PASS xxxx\n");
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
811 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
812 else if (strncmp (command, "ACCT", 4) == 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
813 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
814 request->logging_function (gftp_logging_send, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
815 "ACCT xxxx\n");
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
816 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
817 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
818 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
819 request->logging_function (gftp_logging_send, request->user_data, "%s",
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
820 command);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
821 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
822
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
823 if (write_to_socket (request, command) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
824 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
825 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
826 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
827 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
828
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
829 return (rfc959_read_response (request));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
830 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
831
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
832 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
833 write_to_socket (gftp_request *request, const char *command)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
834 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
835 struct timeval tv;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
836 fd_set fset;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
837
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
838 FD_ZERO (&fset);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
839 FD_SET (fileno (request->sockfd_write), &fset);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
840 tv.tv_sec = request->network_timeout;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
841 tv.tv_usec = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
842 if (!select (fileno (request->sockfd_write) + 1, NULL, &fset, NULL, &tv))
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
843 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
844 request->logging_function (gftp_logging_error, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
845 _("Connection to %s timed out\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
846 request->hostname);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
847 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
848 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
849 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
850
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
851 fwrite (command, strlen (command), 1, request->sockfd_write);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
852 if (ferror (request->sockfd_write))
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
853 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
854 request->logging_function (gftp_logging_error, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
855 _("Error: Could not write to socket: %s\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
856 g_strerror (errno));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
857 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
858 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
859 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
860
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
861 fflush (request->sockfd_write);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
862 if (ferror (request->sockfd_write))
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
863 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
864 request->logging_function (gftp_logging_error, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
865 _("Error: Could not write to socket: %s\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
866 g_strerror (errno));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
867 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
868 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
869 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
870
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
871 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
872 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
873
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
874
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
875
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
876 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
877 rfc959_read_response (gftp_request * request)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
878 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
879 char tempstr[255], code[4];
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
880
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
881 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
882 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
883 g_return_val_if_fail (request->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
884
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
885 *code = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
886 if (request->last_ftp_response)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
887 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
888 g_free (request->last_ftp_response);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
889 request->last_ftp_response = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
890 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
891
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
892 do
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
893 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
894 /* I don't run select() here because select could return
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
895 successfully saying there is data, but the fgets call could block if
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
896 there is no carriage return */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
897 if (!fgets (tempstr, sizeof (tempstr), request->sockfd))
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
898 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
899 tempstr[strlen (tempstr) - 1] = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
900 if (tempstr[strlen (tempstr) - 1] == '\r')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
901 tempstr[strlen (tempstr) - 1] = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
902 if (isdigit ((int) *tempstr) && isdigit ((int) *(tempstr + 1))
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
903 && isdigit ((int) *(tempstr + 2)))
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
904 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
905 strncpy (code, tempstr, 3);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
906 code[3] = ' ';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
907 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
908 request->logging_function (gftp_logging_recv, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
909 "%s\n", tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
910 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
911 while (strncmp (code, tempstr, 4) != 0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
912
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
913 if (ferror (request->sockfd))
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
914 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
915 request->logging_function (gftp_logging_send, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
916 "Error reading from socket: %s\n",
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
917 g_strerror (errno));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
918 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
919 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
920 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
921
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
922 request->last_ftp_response = g_malloc (strlen (tempstr) + 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
923 strcpy (request->last_ftp_response, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
924
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
925 if (*request->last_ftp_response == '4')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
926 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
927
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
928 return (*request->last_ftp_response);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
929 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
930
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
931
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
932 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
933 rfc959_chdir (gftp_request * request, const char *directory)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
934 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
935 char ret, *tempstr, *dir;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
936
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
937 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
938 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
939 g_return_val_if_fail (directory != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
940
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
941 if (strcmp (directory, "..") == 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
942 ret = rfc959_send_command (request, "CDUP\r\n");
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
943 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
944 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
945 tempstr = g_strconcat ("CWD ", directory, "\r\n", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
946 ret = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
947 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
948 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
949
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
950 if (ret != '2')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
951 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
952
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
953 if (directory != request->directory)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
954 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
955 if (request->directory)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
956 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
957 g_free (request->directory);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
958 request->directory = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
959 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
960
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
961 if (rfc959_send_command (request, "PWD\r\n") != '2')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
962 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
963
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
964 tempstr = strchr (request->last_ftp_response, '"');
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
965 if (tempstr != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
966 dir = tempstr + 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
967 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
968 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
969
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
970 tempstr = strchr (dir, '"');
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
971 if (tempstr != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
972 *tempstr = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
973 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
974 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
975 gftp_disconnect (request);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
976 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
977 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
978
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
979 request->directory = g_malloc (strlen (dir) + 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
980 strcpy (request->directory, dir);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
981 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
982
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
983 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
984 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
985
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
986
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
987 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
988 rfc959_rmdir (gftp_request * request, const char *directory)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
989 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
990 char *tempstr, ret;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
991
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
992 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
993 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
994 g_return_val_if_fail (directory != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
995 g_return_val_if_fail (request->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
996
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
997 tempstr = g_strconcat ("RMD ", directory, "\r\n", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
998 ret = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
999 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1000 return (ret == '2' ? 0 : -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1001 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1002
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1003
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1004 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1005 rfc959_rmfile (gftp_request * request, const char *file)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1006 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1007 char *tempstr, ret;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1008
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1009 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1010 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1011 g_return_val_if_fail (file != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1012 g_return_val_if_fail (request->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1013
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1014 tempstr = g_strconcat ("DELE ", file, "\r\n", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1015 ret = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1016 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1017 return (ret == '2' ? 0 : -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1018 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1019
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1020
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1021 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1022 rfc959_mkdir (gftp_request * request, const char *directory)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1023 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1024 char *tempstr, ret;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1025
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1026 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1027 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1028 g_return_val_if_fail (directory != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1029 g_return_val_if_fail (request->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1030
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1031 tempstr = g_strconcat ("MKD ", directory, "\r\n", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1032 ret = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1033 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1034 return (ret == '2' ? 0 : -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1035 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1036
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1037
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1038 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1039 rfc959_rename (gftp_request * request, const char *oldname,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1040 const char *newname)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1041 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1042 char *tempstr, ret;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1043
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1044 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1045 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1046 g_return_val_if_fail (oldname != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1047 g_return_val_if_fail (newname != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1048 g_return_val_if_fail (request->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1049
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1050 tempstr = g_strconcat ("RNFR ", oldname, "\r\n", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1051 ret = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1052 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1053 if (ret != '3')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1054 return (-2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1055
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1056 tempstr = g_strconcat ("RNTO ", newname, "\r\n", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1057 ret = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1058 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1059 return (ret == '2' ? 0 : -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1060 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1061
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1062
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1063 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1064 rfc959_chmod (gftp_request * request, const char *file, int mode)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1065 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1066 char *tempstr, ret;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1067
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1068 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1069 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1070 g_return_val_if_fail (file != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1071 g_return_val_if_fail (request->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1072
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1073 tempstr = g_malloc (strlen (file) + (mode / 10) + 16);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1074 sprintf (tempstr, "SITE CHMOD %d %s\r\n", mode, file);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1075 ret = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1076 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1077 return (ret == '2' ? 0 : -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1078 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1079
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1080
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1081 static int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1082 rfc959_site (gftp_request * request, const char *command)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1083 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1084 char *tempstr, ret;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1085
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1086 g_return_val_if_fail (request != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1087 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1088 g_return_val_if_fail (command != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1089 g_return_val_if_fail (request->sockfd != NULL, -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1090
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1091 tempstr = g_strconcat ("SITE ", command, "\r\n", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1092 ret = rfc959_send_command (request, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1093 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1094 return (request->sockfd != NULL ? ret : -2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1095 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1096
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1097
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1098 static char *
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1099 parse_ftp_proxy_string (gftp_request * request)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1100 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1101 char *startpos, *endpos, *oldstr, *newstr, *newval, *tempport;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1102
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1103 g_return_val_if_fail (request != NULL, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1104 g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1105
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1106 newstr = g_malloc (1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1107 *newstr = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1108 startpos = endpos = request->proxy_config;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1109 while (*endpos != '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1110 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1111 tempport = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1112 if (*endpos == '%' && tolower ((int) *(endpos + 1)) == 'p')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1113 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1114 switch (tolower ((int) *(endpos + 2)))
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1115 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1116 case 'u':
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1117 newval = request->proxy_username;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1118 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1119 case 'p':
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1120 newval = request->proxy_password;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1121 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1122 case 'h':
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1123 newval = request->proxy_hostname;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1124 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1125 case 'o':
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1126 tempport = g_strdup_printf ("%d", request->proxy_port);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1127 newval = tempport;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1128 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1129 case 'a':
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1130 newval = request->proxy_account;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1131 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1132 default:
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1133 endpos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1134 continue;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1135 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1136 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1137 else if (*endpos == '%' && tolower ((int) *(endpos + 1)) == 'h')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1138 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1139 switch (tolower ((int) *(endpos + 2)))
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1140 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1141 case 'u':
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1142 newval = request->username;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1143 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1144 case 'p':
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1145 newval = request->password;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1146 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1147 case 'h':
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1148 newval = request->hostname;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1149 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1150 case 'o':
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1151 tempport = g_strdup_printf ("%d", request->port);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1152 newval = tempport;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1153 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1154 case 'a':
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1155 newval = request->account;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1156 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1157 default:
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1158 endpos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1159 continue;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1160 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1161 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1162 else if (*endpos == '%' && tolower ((int) *(endpos + 1)) == 'n')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1163 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1164 *endpos = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1165 oldstr = newstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1166 newstr = g_strconcat (oldstr, startpos, "\r\n", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1167 g_free (oldstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1168 endpos += 2;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1169 startpos = endpos;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1170 continue;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1171 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1172 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1173 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1174 endpos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1175 continue;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1176 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1177
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1178 *endpos = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1179 oldstr = newstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1180 if (!newval)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1181 newstr = g_strconcat (oldstr, startpos, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1182 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1183 newstr = g_strconcat (oldstr, startpos, newval, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1184 if (tempport)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1185 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1186 g_free (tempport);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1187 tempport = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1188 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1189 g_free (oldstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1190 endpos += 3;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1191 startpos = endpos;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1192 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1193 return (newstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1194 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
1195