annotate lib/misc.c @ 16:ddb983d8574b

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