annotate lib/rfc959.c @ 41:4bcfaf6307b5

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