annotate lib/misc.c @ 39:474d562c7268

2002-10-15 Brian Masney <masneyb@gftp.org> * lib/config_file.c - enable combo in GTK port for Proxy server type * lib/misc.c (gftp_sort_filelist) - make sure prev pointer to first entry is NULL * lib/protocols.c (copy_token) - when setting the end position of the token to \0, after we're done set it back to the origional position * src/gtk/gftp-gtk.c, src/gtk/menu-items.c - changed g_list_first (list) to just list
author masneyb
date Wed, 16 Oct 2002 02:11:09 +0000
parents c8ec7877432e
children 4bcfaf6307b5
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 /* misc.c - general purpose routines */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
3 /* Copyright (C) 1998-2002 Brian Masney <masneyb@gftp.org> */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
4 /* */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
5 /* This program is free software; you can redistribute it and/or modify */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
6 /* it under the terms of the GNU General Public License as published by */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
7 /* the Free Software Foundation; either version 2 of the License, or */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
8 /* (at your option) any later version. */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
9 /* */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
10 /* This program is distributed in the hope that it will be useful, */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
11 /* but WITHOUT ANY WARRANTY; without even the implied warranty of */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
12 /* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
13 /* GNU General Public License for more details. */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
14 /* */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
15 /* You should have received a copy of the GNU General Public License */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
16 /* along with this program; if not, write to the Free Software */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
17 /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
18 /*****************************************************************************/
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
19
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
20 #include "gftp.h"
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
21 #include "options.h"
33
c8ec7877432e 2002-10-06 Brian Masney <masneyb@gftp.org>
masneyb
parents: 16
diff changeset
22 static const char cvsid[] = "$Id$";
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
23
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
24 char *
14
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 13
diff changeset
25 insert_commas (off_t number, char *dest_str, size_t dest_len)
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
26 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
27 char *frompos, *topos, src[50], *dest;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
28 int len, num, rem, i;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
29
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
30 if (dest_str != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
31 *dest_str = '\0';
13
cd2e26a69461 don't allow passing a 0 to log10
masneyb
parents: 1
diff changeset
32 len = (number > 0 ? log10 (number) : 0) + 1;
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
33
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
34 if (len <= 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
35 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
36 if (dest_str != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
37 strncpy (dest_str, "0", dest_len);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
38 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
39 dest_str = g_strconcat ("0", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
40 return (dest_str);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
41 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
42
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
43 len += len / 3;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
44 if (dest_str != NULL && len > dest_len)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
45 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
46
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
47 for (i=0; i<dest_len - 1; i++)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
48 dest_str[i] = 'X';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
49 dest_str[dest_len - 1] = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
50 return (dest_str);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
51 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
52
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
53 if (dest_str == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
54 dest = g_malloc0 (len);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
55 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
56 dest = dest_str;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
57
14
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 13
diff changeset
58 #if defined (_LARGEFILE_SOURCE)
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 13
diff changeset
59 g_snprintf (src, sizeof (src), "%lld", number);
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 13
diff changeset
60 #else
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
61 g_snprintf (src, sizeof (src), "%ld", number);
14
83090328581e * More largefile support. Hopefully all that is left is the configure stuff
masneyb
parents: 13
diff changeset
62 #endif
1
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
63
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
64 num = strlen (src) / 3 - 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
65 rem = strlen (src) % 3;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
66 frompos = src;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
67 topos = dest;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
68 for (i = 0; i < rem; i++)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
69 *topos++ = *frompos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
70
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
71 if (*frompos != '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
72 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
73 if (rem != 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
74 *topos++ = ',';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
75 while (num > 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
76 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
77 for (i = 0; i < 3; i++)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
78 *topos++ = *frompos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
79 *topos++ = ',';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
80 num--;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
81 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
82 for (i = 0; i < 3; i++)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
83 *topos++ = *frompos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
84 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
85 *topos = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
86 return (dest);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
87 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
88
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
89
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
90 long
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
91 file_countlf (int filefd, long endpos)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
92 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
93 char tempstr[255];
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
94 long num, mypos;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
95 ssize_t n;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
96 int i;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
97
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
98 mypos = num = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
99 lseek (filefd, 0, SEEK_SET);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
100 while ((n = read (filefd, tempstr, sizeof (tempstr))) > 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
101 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
102 for (i = 0; i < n; i++)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
103 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
104 if ((tempstr[i] == '\n') && (i > 0) && (tempstr[i - 1] != '\r')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
105 && (endpos == 0 || mypos + i <= endpos))
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
106 ++num;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
107 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
108 mypos += n;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
109 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
110 lseek (filefd, 0, SEEK_SET);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
111 return (num);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
112 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
113
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
114
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
115 char *
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
116 alltrim (char *str)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
117 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
118 char *pos, *newpos;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
119 int diff;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
120
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
121 pos = str + strlen (str) - 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
122 while (pos >= str && *pos == ' ')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
123 *pos-- = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
124
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
125 pos = str;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
126 diff = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
127 while (*pos++ == ' ')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
128 diff++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
129
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
130 if (diff == 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
131 return (str);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
132
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
133 pos = str + diff;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
134 newpos = str;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
135 while (*pos != '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
136 *newpos++ = *pos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
137 *newpos = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
138
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
139 return (str);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
140 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
141
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
142
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
143 char *
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
144 expand_path (const char *src)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
145 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
146 char *str, *pos, *endpos, *prevpos, *newstr, *tempstr, tempchar;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
147 struct passwd *pw;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
148
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
149 pw = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
150 str = g_malloc (strlen (src) + 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
151 strcpy (str, src);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
152
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
153 if (*str == '~')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
154 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
155 if (*(str + 1) == '/' || *(str + 1) == '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
156 pw = getpwuid (geteuid ());
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
157 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
158 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
159 if ((pos = strchr (str, '/')) != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
160 *pos = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
161
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
162 pw = getpwnam (str + 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
163
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
164 if (pos != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
165 *pos = '/';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
166 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
167 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
168
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
169 endpos = str;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
170 newstr = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
171 while ((pos = strchr (endpos, '/')) != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
172 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
173 pos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
174 while (*pos == '/')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
175 pos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
176 if ((endpos = strchr (pos, '/')) == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
177 endpos = pos + strlen (pos);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
178 tempchar = *endpos;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
179 *endpos = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
180 if (strcmp (pos, "..") == 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
181 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
182 *(pos - 1) = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
183 if (newstr != NULL && (prevpos = strrchr (newstr, '/')) != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
184 *prevpos = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
185 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
186 else if (strcmp (pos, ".") != 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
187 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
188 if (newstr == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
189 newstr = g_strconcat (pos - 1, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
190 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
191 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
192 tempstr = g_strconcat (newstr, pos - 1, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
193 g_free (newstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
194 newstr = tempstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
195 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
196 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
197 *endpos = tempchar;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
198 if (*endpos == '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
199 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
200 endpos = pos + 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
201 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
202
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
203 if (newstr == NULL || *newstr == '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
204 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
205 if (newstr != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
206 g_free (newstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
207 newstr = g_malloc0 (2);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
208 *newstr = '/';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
209 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
210
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
211 g_free (str);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
212
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
213 if (pw != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
214 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
215 if ((pos = strchr (newstr, '/')) == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
216 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
217 str = g_malloc (strlen (pw->pw_dir) + 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
218 strcpy (str, pw->pw_dir);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
219 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
220 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
221 str = g_strconcat (pw->pw_dir, pos, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
222
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
223 g_free (newstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
224 newstr = str;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
225 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
226
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
227 return (newstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
228 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
229
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
230
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
231 void
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
232 remove_double_slashes (char *string)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
233 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
234 char *newpos, *oldpos;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
235
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
236 oldpos = newpos = string;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
237 while (*oldpos != '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
238 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
239 *newpos++ = *oldpos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
240 if (*oldpos == '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
241 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
242 while (*(newpos - 1) == '/' && *(oldpos) == '/')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
243 oldpos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
244 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
245 *newpos = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
246 if (string[strlen (string) - 1] == '/')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
247 string[strlen (string) - 1] = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
248 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
249
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
250
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
251 void
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
252 make_nonnull (char **str)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
253 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
254 if (*str == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
255 *str = g_malloc0 (1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
256 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
257
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
258
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
259 int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
260 copyfile (char *source, char *dest)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
261 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
262 FILE *srcfd, *destfd;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
263 char buf[8192];
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
264 size_t n;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
265
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
266 if ((srcfd = fopen (source, "rb")) == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
267 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
268
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
269 if ((destfd = fopen (dest, "wb")) == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
270 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
271 fclose (srcfd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
272 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
273 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
274
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
275 while ((n = fread (buf, 1, sizeof (buf), srcfd)) > 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
276 fwrite (buf, 1, n, destfd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
277
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
278 fclose (srcfd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
279 fclose (destfd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
280
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
281 return (1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
282 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
283
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
284
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
285 int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
286 gftp_match_filespec (char *filename, char *filespec)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
287 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
288 char *filepos, *wcpos, *pos, *newpos, search_str[20];
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
289 size_t len, curlen;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
290
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
291 if (filename == NULL || *filename == '\0' ||
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
292 filespec == NULL || *filespec == '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
293 return(1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
294
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
295 filepos = filename;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
296 wcpos = filespec;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
297 while(1)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
298 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
299 if (*wcpos == '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
300 return (1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
301 else if (*filepos == '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
302 return(0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
303 else if(*wcpos == '?')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
304 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
305 wcpos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
306 filepos++;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
307 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
308 else if(*wcpos == '*' && *(wcpos+1) == '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
309 return(1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
310 else if(*wcpos == '*')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
311 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
312 len = sizeof (search_str);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
313 for (pos = wcpos + 1, newpos = search_str, curlen = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
314 *pos != '*' && *pos != '?' && *pos != '\0' && curlen < len;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
315 curlen++, *newpos++ = *pos++);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
316 *newpos = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
317
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
318 if ((filepos = strstr (filepos, search_str)) == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
319 return(0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
320 wcpos += curlen + 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
321 filepos += curlen;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
322 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
323 else if(*wcpos++ != *filepos++)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
324 return(0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
325 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
326 return (1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
327 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
328
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
329
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
330 int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
331 gftp_parse_command_line (int *argc, char ***argv)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
332 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
333 if (*argc > 1)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
334 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
335 if (strcmp (argv[0][1], "--help") == 0 || strcmp (argv[0][1], "-h") == 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
336 gftp_usage ();
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
337 else if (strcmp (argv[0][1], "--version") == 0 || strcmp (argv[0][1], "-v") == 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
338 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
339 printf ("%s\n", version);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
340 exit (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
341 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
342 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
343 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
344 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
345
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
346
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
347 void
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
348 gftp_usage (void)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
349 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
350 printf (_("usage: gftp [[ftp://][user:[pass]@]ftp-site[:port][/directory]]\n"));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
351 exit (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
352 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
353
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
354
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
355 char *
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
356 get_xpm_path (char *filename, int quit_on_err)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
357 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
358 char *tempstr, *exfile;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
359
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
360 tempstr = g_strconcat (BASE_CONF_DIR, "/", filename, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
361 exfile = expand_path (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
362 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
363 if (access (exfile, F_OK) != 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
364 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
365 g_free (exfile);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
366 tempstr = g_strconcat (SHARE_DIR, "/", filename, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
367 exfile = expand_path (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
368 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
369 if (access (exfile, F_OK) != 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
370 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
371 g_free (exfile);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
372 exfile = g_strconcat ("/usr/share/icons/", filename, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
373 if (access (exfile, F_OK) != 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
374 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
375 g_free (exfile);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
376 if (!quit_on_err)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
377 return (NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
378 printf (_("gFTP Error: Cannot find file %s in %s or %s\n"),
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
379 filename, SHARE_DIR, BASE_CONF_DIR);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
380 exit (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
381 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
382 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
383 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
384 return (exfile);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
385 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
386
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
387
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
388 gint
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
389 string_hash_compare (gconstpointer path1, gconstpointer path2)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
390 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
391 return (strcmp ((char *) path1, (char *) path2) == 0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
392 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
393
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
394
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
395 guint
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
396 string_hash_function (gconstpointer key)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
397 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
398 return (((char *) key)[0] + ((char *) key)[1] + ((char *) key)[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 void
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
403 free_file_list (GList * filelist)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
404 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
405 gftp_file * tempfle;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
406 GList * templist;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
407
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
408 templist = filelist;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
409 while (templist != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
410 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
411 tempfle = templist->data;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
412 free_fdata (tempfle);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
413 templist = templist->next;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
414 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
415 g_list_free (filelist);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
416 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
417
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
418
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
419 void
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
420 free_fdata (gftp_file * fle)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
421 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
422 if (fle->file)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
423 g_free (fle->file);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
424 if (fle->user)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
425 g_free (fle->user);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
426 if (fle->group)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
427 g_free (fle->group);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
428 if (fle->attribs)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
429 g_free (fle->attribs);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
430 if (fle->destfile)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
431 g_free (fle->destfile);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
432 if (fle->fd)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
433 fclose (fle->fd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
434 g_free (fle);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
435 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
436
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
437
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
438 gftp_file *
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
439 copy_fdata (gftp_file * fle)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
440 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
441 gftp_file * newfle;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
442
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
443 newfle = g_malloc0 (sizeof (*newfle));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
444 memcpy (newfle, fle, sizeof (*newfle));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
445
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
446 if (fle->file)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
447 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
448 newfle->file = g_malloc (strlen (fle->file) + 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
449 strcpy (newfle->file, fle->file);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
450 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
451
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
452 if (fle->user)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
453 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
454 newfle->user = g_malloc (strlen (fle->user) + 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
455 strcpy (newfle->user, fle->user);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
456 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
457
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
458 if (fle->group)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
459 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
460 newfle->group = g_malloc (strlen (fle->group) + 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
461 strcpy (newfle->group, fle->group);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
462 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
463
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
464 if (fle->attribs)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
465 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
466 newfle->attribs = g_malloc (strlen (fle->attribs) + 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
467 strcpy (newfle->attribs, fle->attribs);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
468 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
469
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
470 if (fle->destfile)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
471 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
472 newfle->destfile = g_malloc (strlen (fle->destfile) + 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
473 strcpy (newfle->destfile, fle->destfile);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
474 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
475 return (newfle);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
476 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
477
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
478
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
479 void
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
480 swap_socks (gftp_request * dest, gftp_request * source)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
481 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
482 dest->sockfd = source->sockfd;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
483 dest->datafd = source->datafd;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
484 dest->sockfd_write = source->sockfd_write;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
485 dest->cached = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
486 if (!source->always_connected)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
487 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
488 source->sockfd = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
489 source->datafd = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
490 source->sockfd_write = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
491 source->cached = 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
492 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
493 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
494
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
495
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
496 int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
497 compare_request (gftp_request * request1, gftp_request * request2,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
498 int compare_dirs)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
499 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
500 char *strarr[3][2];
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
501 int i, ret;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
502
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
503 ret = 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
504 if (strcmp (request1->protocol_name, request2->protocol_name) == 0 &&
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
505 request1->port == request2->port)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
506 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
507 strarr[0][0] = request1->hostname;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
508 strarr[0][1] = request2->hostname;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
509 strarr[1][0] = request1->username;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
510 strarr[1][1] = request2->username;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
511 if (compare_dirs)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
512 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
513 strarr[2][0] = request1->directory;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
514 strarr[2][1] = request2->directory;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
515 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
516 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
517 strarr[2][0] = strarr[2][1] = "";
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
518
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
519 for (i = 0; i < 3; i++)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
520 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
521 if ((strarr[i][0] && !strarr[i][1]) ||
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
522 (!strarr[i][0] && strarr[i][1]))
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
523 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
524 ret = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
525 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
526 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
527
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
528 if (strarr[i][0] && strarr[i][1] &&
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
529 strcmp (strarr[i][0], strarr[i][1]) != 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
530 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
531 ret = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
532 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
533 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
534 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
535 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
536 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
537 ret = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
538 return (ret);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
539 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
540
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
541
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
542 void
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
543 free_tdata (gftp_transfer * tdata)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
544 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
545 if (tdata->statmutex)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
546 g_free (tdata->statmutex);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
547 if (tdata->structmutex)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
548 g_free (tdata->structmutex);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
549 if (tdata->fromreq != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
550 gftp_request_destroy (tdata->fromreq);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
551 if (tdata->toreq != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
552 gftp_request_destroy (tdata->toreq);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
553 free_file_list (tdata->files);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
554 g_free (tdata);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
555 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
556
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
557
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
558 gftp_request *
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
559 copy_request (gftp_request * req)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
560 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
561 gftp_request * newreq;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
562
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
563 newreq = g_malloc0 (sizeof (*newreq));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
564 memcpy (newreq, req, sizeof (*newreq));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
565
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
566 if (req->hostname)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
567 newreq->hostname = g_strconcat (req->hostname, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
568 if (req->username)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
569 newreq->username = g_strconcat (req->username, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
570 if (req->password)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
571 newreq->password = g_strconcat (req->password, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
572 if (req->account)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
573 newreq->account = g_strconcat (req->account, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
574 if (req->directory)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
575 newreq->directory = g_strconcat (req->directory, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
576
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
577 newreq->url_prefix = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
578 newreq->protocol_name = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
579 newreq->sftpserv_path = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
580 newreq->proxy_config = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
581 newreq->proxy_hostname = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
582 newreq->proxy_username = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
583 newreq->proxy_password = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
584 newreq->proxy_account = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
585 newreq->last_ftp_response = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
586 newreq->last_dir_entry = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
587 newreq->sockfd = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
588 newreq->sockfd_write = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
589 newreq->datafd = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
590 newreq->cachefd = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
591 newreq->hostp = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
592 newreq->protocol_data = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
593
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
594 if (req->proxy_config != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
595 newreq->proxy_config = g_strconcat (req->proxy_config, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
596
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
597 req->init (newreq);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
598
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
599 return (newreq);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
600 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
601
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
602
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
603 int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
604 ptym_open (char *pts_name)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
605 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
606 int fd;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
607
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
608 #ifdef __sgi
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
609 char *tempstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
610
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
611 if ((tempstr = _getpty (&fd, O_RDWR, 0600, 0)) == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
612 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
613
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
614 strcpy (pts_name, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
615 return (fd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
616
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
617 #else /* !__sgi */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
618
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
619 #ifdef SYSV
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
620
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
621 char *tempstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
622
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
623 strcpy (pts_name, "/dev/ptmx");
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
624 if ((fd = open (pts_name, O_RDWR)) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
625 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
626
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
627 if (grantpt (fd) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
628 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
629 close (fd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
630 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
631 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
632
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
633 if (unlockpt (fd) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
634 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
635 close (fd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
636 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
637 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
638
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
639 if ((tempstr = ptsname (fd)) == NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
640 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
641 close (fd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
642 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
643 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
644
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
645 strcpy (pts_name, tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
646 return (fd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
647
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
648 #else /* !SYSV */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
649
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
650 char *pos1, *pos2;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
651
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
652 strcpy (pts_name, "/dev/ptyXY");
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
653 for (pos1 = "pqrstuvwxyzPQRST"; *pos1 != '\0'; pos1++)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
654 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
655 pts_name[8] = *pos1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
656 for (pos2 = "0123456789abcdef"; *pos2 != '\0'; pos2++)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
657 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
658 pts_name[9] = *pos2;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
659 if ((fd = open (pts_name, O_RDWR)) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
660 continue;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
661 pts_name[5] = 't';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
662 return (fd);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
663 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
664 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
665 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
666
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
667 #endif
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
668
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
669 #endif
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
670
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
671 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
672
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
673
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
674 int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
675 ptys_open (int fdm, char *pts_name)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
676 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
677 int fds;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
678
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
679 #if !defined (SYSV) && !defined (__sgi)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
680
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
681 chmod (pts_name, S_IRUSR | S_IWUSR);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
682 chown (pts_name, getuid (), -1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
683
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
684 #endif
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
685
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
686 if ((fds = open (pts_name, O_RDWR)) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
687 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
688 close (fdm);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
689 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
690 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
691
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
692 #ifdef SYSV
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
693
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
694 if (ioctl (fds, I_PUSH, "ptem") < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
695 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
696 close (fdm);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
697 close (fds);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
698 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
699 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
700
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
701 if (ioctl (fds, I_PUSH, "ldterm") < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
702 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
703 close (fdm);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
704 close (fds);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
705 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
706 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
707
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
708 if (ioctl (fds, I_PUSH, "ttcompat") < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
709 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
710 close (fdm);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
711 close (fds);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
712 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
713 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
714
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
715 #endif
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
716
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
717 #if !defined(SYSV) && !defined (__sgi) && defined(TIOCSCTTY) && !defined(CIBAUD)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
718
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
719 if (ioctl (fds, TIOCSCTTY, (char *) 0) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
720 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
721 close (fdm);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
722 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
723 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
724
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
725 #endif
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
726
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
727 return (fds);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
728 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
729
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
730
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
731 int
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
732 tty_raw (int fd)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
733 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
734 struct termios buf;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
735
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
736 if (tcgetattr (fd, &buf) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
737 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
738
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
739 buf.c_iflag |= IGNPAR;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
740 buf.c_iflag &= ~(ICRNL | ISTRIP | IXON | IGNCR | IXANY | IXOFF | INLCR);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
741 buf.c_lflag &= ~(ECHO | ICANON | ISIG | ECHOE | ECHOK | ECHONL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
742 #ifdef IEXTEN
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
743 buf.c_lflag &= ~(IEXTEN);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
744 #endif
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
745
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
746 buf.c_oflag &= ~(OPOST);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
747 buf.c_cc[VMIN] = 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
748 buf.c_cc[VTIME] = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
749
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
750 if (tcsetattr (fd, TCSADRAIN, &buf) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
751 return (-1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
752 return (0);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
753 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
754
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
755
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
756 /* We have the caller send us a pointer to a string so we can write the port
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
757 into it. It makes it easier so we don't have to worry about freeing it
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
758 later on, the caller can just send us an auto variable, The string
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
759 should be at least 6 chars. I know this is messy... */
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
760
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
761 char **
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
762 make_ssh_exec_args (gftp_request * request, char *execname,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
763 int use_sftp_subsys, char *portstring)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
764 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
765 char **args, *oldstr, *tempstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
766 int i, j;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
767
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
768 args = g_malloc (sizeof (char *) * (num_ssh_extra_params + 10));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
769
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
770 args[0] = ssh_prog_name != NULL && *ssh_prog_name != '\0' ?
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
771 ssh_prog_name : "ssh";
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
772 i = 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
773 tempstr = g_strconcat (args[0], NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
774
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
775 if (ssh_extra_params_list != NULL)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
776 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
777 for (j=0; ssh_extra_params_list[j] != NULL; j++)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
778 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
779 oldstr = tempstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
780 args[i++] = ssh_extra_params_list[j];
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
781 tempstr = g_strconcat (oldstr, " ", ssh_extra_params_list[j], NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
782 g_free (oldstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
783 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
784 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
785
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
786 oldstr = tempstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
787 tempstr = g_strconcat (oldstr, " -e none", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
788 g_free (oldstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
789 args[i++] = "-e";
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
790 args[i++] = "none";
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
791
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
792 if (request->username && *request->username != '\0')
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
793 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
794 oldstr = tempstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
795 tempstr = g_strconcat (oldstr, " -l ", request->username, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
796 g_free (oldstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
797 args[i++] = "-l";
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
798 args[i++] = request->username;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
799 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
800
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
801 if (request->port != 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
802 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
803 g_snprintf (portstring, 6, "%d", request->port);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
804 oldstr = tempstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
805 tempstr = g_strconcat (oldstr, " -p ", portstring, NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
806 g_free (oldstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
807 args[i++] = "-p";
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
808 args[i++] = portstring;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
809 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
810
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
811 if (use_sftp_subsys)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
812 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
813 oldstr = tempstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
814 tempstr = g_strconcat (oldstr, " ", request->hostname, " -s sftp", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
815 g_free (oldstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
816 args[i++] = request->hostname;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
817 args[i++] = "-s";
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
818 args[i++] = "sftp";
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
819 args[i] = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
820 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
821 else
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
822 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
823 oldstr = tempstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
824 tempstr = g_strconcat (oldstr, " ", request->hostname, " \"", execname,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
825 "\"", NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
826 g_free (oldstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
827 args[i++] = request->hostname;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
828 args[i++] = execname;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
829 args[i] = NULL;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
830 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
831
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
832 request->logging_function (gftp_logging_misc, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
833 _("Running program %s\n"), tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
834 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
835 return (args);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
836 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
837
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
838
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
839 char *
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
840 ssh_start_login_sequence (gftp_request * request, int fd)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
841 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
842 size_t rem, len, diff, lastdiff;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
843 int flags, wrotepw, ok;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
844 struct timeval tv;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
845 char *tempstr;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
846 fd_set rdfds;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
847 ssize_t rd;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
848
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
849 rem = len = 100;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
850 tempstr = g_malloc0 (len);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
851 diff = lastdiff = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
852 wrotepw = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
853 ok = 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
854
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
855 if ((flags = fcntl (fd, F_GETFL, 0)) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
856 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
857 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
858 return (NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
859 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
860
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
861 if (fcntl (fd, F_SETFL, flags | O_NONBLOCK) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
862 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
863 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
864 return (NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
865 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
866
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
867 while (1)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
868 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
869 FD_ZERO (&rdfds);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
870 FD_SET (fd, &rdfds);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
871 tv.tv_sec = 5;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
872 tv.tv_usec = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
873 if (select (fd + 1, &rdfds, NULL, NULL, &tv) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
874 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
875 if (errno == EINTR)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
876 continue;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
877 ok = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
878 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
879 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
880
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
881 if ((rd = read (fd, tempstr + diff, rem - 1)) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
882 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
883 if (errno == EINTR)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
884 continue;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
885 ok = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
886 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
887 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
888 else if (rd == 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
889 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
890 ok = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
891 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
892 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
893 tempstr[diff + rd] = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
894 rem -= rd;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
895 diff += rd;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
896 if (rem <= 1)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
897 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
898 tempstr = g_realloc (tempstr, len + 100);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
899 tempstr[diff] = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
900 request->logging_function (gftp_logging_recv, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
901 "%s", tempstr + lastdiff);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
902 lastdiff = diff;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
903 len += 100;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
904 rem = 100;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
905 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
906
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
907 if (!wrotepw &&
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
908 strlen (tempstr) > 11 && strcmp (tempstr + strlen (tempstr) - 10,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
909 "password: ") == 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
910 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
911 wrotepw = 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
912 write (fd, request->password, strlen (request->password));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
913 write (fd, "\n", 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
914 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
915
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
916 else if (!wrotepw &&
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
917 (strstr (tempstr, "Enter passphrase for RSA key") != NULL ||
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
918 strstr (tempstr, "Enter passphrase for key '") != NULL))
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
919 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
920 wrotepw = 1;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
921 write (fd, request->password, strlen (request->password));
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
922 write (fd, "\n", 1);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
923 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
924 else if (strlen (tempstr) >= 5 &&
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
925 strcmp (tempstr + strlen (tempstr) - 5, "xsftp") == 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
926 break;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
927 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
928
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
929 tempstr[diff] = '\0';
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
930 request->logging_function (gftp_logging_recv, request->user_data,
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
931 "%s\n", tempstr + lastdiff);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
932
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
933 if (ok && fcntl (fd, F_SETFL, flags) < 0)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
934 ok = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
935
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
936 if (!ok)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
937 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
938 g_free (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
939 return (NULL);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
940 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
941
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
942 return (tempstr);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
943 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
944
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
945
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
946 #ifdef G_HAVE_GINT64
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
947
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
948 gint64
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
949 hton64 (gint64 val)
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
950 {
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
951 gint64 num;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
952 char *pos;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
953
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
954 num = 0;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
955 pos = (char *) &num;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
956 pos[0] = (val >> 56) & 0xff;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
957 pos[1] = (val >> 48) & 0xff;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
958 pos[2] = (val >> 40) & 0xff;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
959 pos[3] = (val >> 32) & 0xff;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
960 pos[4] = (val >> 24) & 0xff;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
961 pos[5] = (val >> 16) & 0xff;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
962 pos[6] = (val >> 8) & 0xff;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
963 pos[7] = val & 0xff;
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
964 return (num);
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
965 }
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
966
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
967 #endif
8b1883341c6f Initial revision
masneyb
parents:
diff changeset
968
16
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
969
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
970 static gint
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
971 gftp_file_sort_function_as (gconstpointer a, gconstpointer b)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
972 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
973 const gftp_file * f1, * f2;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
974
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
975 f1 = a;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
976 f2 = b;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
977 return (strcmp (f1->file, f2->file));
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
978 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
979
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
980
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
981 static gint
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
982 gftp_file_sort_function_ds (gconstpointer a, gconstpointer b)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
983 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
984 const gftp_file * f1, * f2;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
985 gint ret;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
986
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
987 f1 = a;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
988 f2 = b;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
989 ret = strcmp (f1->file, f2->file);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
990 if (ret < 0)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
991 ret = 1;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
992 else if (ret > 0)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
993 ret = -1;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
994 return (ret);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
995 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
996
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
997
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
998 static gint
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
999 gftp_user_sort_function_as (gconstpointer a, gconstpointer b)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1000 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1001 const gftp_file * f1, * f2;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1002
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1003 f1 = a;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1004 f2 = b;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1005 return (strcmp (f1->user, f2->user));
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1006 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1007
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1008
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1009 static gint
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1010 gftp_user_sort_function_ds (gconstpointer a, gconstpointer b)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1011 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1012 const gftp_file * f1, * f2;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1013 gint ret;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1014
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1015 f1 = a;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1016 f2 = b;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1017 ret = strcmp (f1->user, f2->user);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1018 if (ret < 0)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1019 ret = 1;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1020 else if (ret > 0)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1021 ret = -1;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1022 return (ret);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1023 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1024
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1025
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1026 static gint
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1027 gftp_group_sort_function_as (gconstpointer a, gconstpointer b)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1028 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1029 const gftp_file * f1, * f2;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1030
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1031 f1 = a;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1032 f2 = b;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1033 return (strcmp (f1->group, f2->group));
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1034 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1035
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1036
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1037 static gint
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1038 gftp_group_sort_function_ds (gconstpointer a, gconstpointer b)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1039 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1040 const gftp_file * f1, * f2;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1041 gint ret;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1042
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1043 f1 = a;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1044 f2 = b;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1045 ret = strcmp (f1->group, f2->group);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1046 if (ret < 0)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1047 ret = 1;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1048 else if (ret > 0)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1049 ret = -1;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1050 return (ret);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1051 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1052
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1053
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1054 static gint
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1055 gftp_attribs_sort_function_as (gconstpointer a, gconstpointer b)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1056 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1057 const gftp_file * f1, * f2;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1058
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1059 f1 = a;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1060 f2 = b;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1061 return (strcmp (f1->attribs, f2->attribs));
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1062 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1063
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1064
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1065 static gint
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1066 gftp_attribs_sort_function_ds (gconstpointer a, gconstpointer b)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1067 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1068 const gftp_file * f1, * f2;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1069 gint ret;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1070
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1071 f1 = a;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1072 f2 = b;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1073 ret = strcmp (f1->attribs, f2->attribs);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1074 if (ret < 0)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1075 ret = 1;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1076 else if (ret > 0)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1077 ret = -1;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1078 return (ret);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1079 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1080
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1081
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1082 static gint
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1083 gftp_size_sort_function_as (gconstpointer a, gconstpointer b)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1084 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1085 const gftp_file * f1, * f2;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1086
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1087 f1 = a;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1088 f2 = b;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1089 if (f1->size < f2->size)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1090 return (-1);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1091 else if (f1->size == f2->size)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1092 return (0);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1093 else
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1094 return (1);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1095 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1096
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1097
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1098 static gint
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1099 gftp_size_sort_function_ds (gconstpointer a, gconstpointer b)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1100 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1101 const gftp_file * f1, * f2;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1102
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1103 f1 = a;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1104 f2 = b;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1105 if (f1->size < f2->size)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1106 return (1);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1107 else if (f1->size == f2->size)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1108 return (0);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1109 else
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1110 return (-1);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1111 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1112
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1113
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1114 static gint
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1115 gftp_datetime_sort_function_as (gconstpointer a, gconstpointer b)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1116 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1117 const gftp_file * f1, * f2;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1118
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1119 f1 = a;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1120 f2 = b;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1121 if (f1->datetime < f2->datetime)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1122 return (-1);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1123 else if (f1->datetime == f2->datetime)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1124 return (0);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1125 else
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1126 return (1);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1127 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1128
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1129
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1130 static gint
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1131 gftp_datetime_sort_function_ds (gconstpointer a, gconstpointer b)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1132 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1133 const gftp_file * f1, * f2;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1134
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1135 f1 = a;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1136 f2 = b;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1137 if (f1->datetime < f2->datetime)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1138 return (1);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1139 else if (f1->datetime == f2->datetime)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1140 return (0);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1141 else
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1142 return (-1);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1143 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1144
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1145
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1146 GList *
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1147 gftp_sort_filelist (GList * filelist, int column, int asds)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1148 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1149 GList * files, * dirs, * dotdot, * tempitem, * insitem;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1150 GCompareFunc sortfunc;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1151 gftp_file * tempfle;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1152
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1153 files = dirs = dotdot = NULL;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1154
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1155 if (column == GFTP_SORT_COL_FILE)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1156 sortfunc = asds ? gftp_file_sort_function_as : gftp_file_sort_function_ds;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1157 else if (column == GFTP_SORT_COL_SIZE)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1158 sortfunc = asds ? gftp_size_sort_function_as : gftp_size_sort_function_ds;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1159 else if (column == GFTP_SORT_COL_USER)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1160 sortfunc = asds ? gftp_user_sort_function_as : gftp_user_sort_function_ds;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1161 else if (column == GFTP_SORT_COL_GROUP)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1162 sortfunc = asds ?
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1163 gftp_group_sort_function_as : gftp_group_sort_function_ds;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1164 else if (column == GFTP_SORT_COL_DATETIME)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1165 sortfunc = asds ?
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1166 gftp_datetime_sort_function_as : gftp_datetime_sort_function_ds; else /* GFTP_SORT_COL_ATTRIBS */
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1167 sortfunc = asds ?
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1168 gftp_attribs_sort_function_as : gftp_attribs_sort_function_ds;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1169
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1170 for (tempitem = filelist; tempitem != NULL; )
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1171 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1172 tempfle = tempitem->data;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1173 insitem = tempitem;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1174 tempitem = tempitem->next;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1175 insitem->next = NULL;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1176
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1177 if (dotdot == NULL && strcmp (tempfle->file, "..") == 0)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1178 dotdot = insitem;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1179 else if (sort_dirs_first && tempfle->isdir)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1180 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1181 insitem->next = dirs;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1182 dirs = insitem;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1183 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1184 else
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1185 {
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1186 insitem->next = files;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1187 files = insitem;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1188 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1189 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1190
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1191 if (dirs != NULL)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1192 dirs = g_list_sort (dirs, sortfunc);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1193 if (files != NULL)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1194 files = g_list_sort (files, sortfunc);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1195
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1196 filelist = dotdot;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1197
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1198 if (filelist == NULL)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1199 filelist = dirs;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1200 else
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1201 filelist = g_list_concat (filelist, dirs);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1202
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1203 if (filelist == NULL)
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1204 filelist = files;
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1205 else
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1206 filelist = g_list_concat (filelist, files);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1207
39
474d562c7268 2002-10-15 Brian Masney <masneyb@gftp.org>
masneyb
parents: 33
diff changeset
1208 /* I haven't check this, but I'm pretty sure some older versions of glib
474d562c7268 2002-10-15 Brian Masney <masneyb@gftp.org>
masneyb
parents: 33
diff changeset
1209 had a bug that the prev pointer wasn't being sent to NULL */
474d562c7268 2002-10-15 Brian Masney <masneyb@gftp.org>
masneyb
parents: 33
diff changeset
1210 filelist->prev = NULL;
16
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1211 return (filelist);
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1212 }
ddb983d8574b * Improved directory sorting algorithm
masneyb
parents: 14
diff changeset
1213