ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Urlader/urlader.c
(Generate patch)

Comparing Urlader/urlader.c (file contents):
Revision 1.5 by root, Fri Dec 30 09:34:20 2011 UTC vs.
Revision 1.14 by root, Mon Feb 6 21:57:48 2012 UTC

1#ifndef URLADER 1/*
2# define URLADER "urlader" 2 * Copyright (c) 2012 Marc Alexander Lehmann <schmorp@schmorp.de>
3#endif 3 *
4#define URLADER_VERSION "1.0" // a decimal number, not a version string 4 * Redistribution and use in source and binary forms, with or without modifica-
5 * tion, are permitted provided that the following conditions are met:
6 *
7 * 1. Redistributions of source code must retain the above copyright notice,
8 * this list of conditions and the following disclaimer.
9 *
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 *
14 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
15 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
16 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
17 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
18 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
20 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
21 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
22 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
23 * OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
25 * Alternatively, the contents of this file may be used under the terms of
26 * the GNU General Public License ("GPL") version 2 or any later version,
27 * in which case the provisions of the GPL are applicable instead of
28 * the above. If you wish to allow the use of your version of this file
29 * only under the terms of the GPL and not to allow others to use your
30 * version of this file under the BSD license, indicate your decision
31 * by deleting the provisions above and replace them with the notice
32 * and other provisions required by the GPL. If you do not delete the
33 * provisions above, a recipient may use your version of this file under
34 * either the BSD or the GPL.
35 */
36
37#include "urlib.h"
38#include "urlib.c"
5 39
6#include <stdio.h> 40#include <stdio.h>
7#include <stdlib.h> 41#include <stdlib.h>
8#include <unistd.h> 42#include <unistd.h>
9#include <errno.h> 43#include <errno.h>
10#include <string.h> 44#include <string.h>
11#include <time.h> 45#include <time.h>
12#include <fcntl.h>
13 46
14#include "liblzf/lzf_d.c" 47#include "liblzf/lzf_d.c"
15 48
16#define TAIL_MAGIC "SCHMORPPACK0" 49/* some simple? dynamic memory management for paths might save ltos of ram */
17
18#ifdef _WIN32
19
20 #include <windows.h>
21 //#include <winbase.h>
22 #include <shlobj.h>
23 #include <shlwapi.h>
24 #include <wininet.h>
25
26 static DWORD dword;
27
28 #define u_handle HANDLE
29 #define u_valid(handle) (!!handle)
30
31 #define u_setenv(name,value) SetEnvironmentVariable (name, value)
32 #define u_mkdir(path) !CreateDirectory (path, NULL)
33 #define u_chdir(path) !SetCurrentDirectory (path)
34 #define u_rename(fr,to) !MoveFile (fr, to)
35 #define u_open(path) CreateFile (path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL)
36 #define u_creat(path,exec) CreateFile (path, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL)
37 #define u_close(handle) CloseHandle (handle)
38 #define u_append(path,add) PathAppend (path, add)
39 #define u_write(handle,data,len) (WriteFile (handle, data, len, &dword, 0) ? dword : -1)
40
41 #define u_fsync(handle) FlushFileBuffers (handle)
42 #define u_sync()
43
44#else
45
46 #include <sys/mman.h>
47 #include <sys/types.h>
48 #include <pwd.h>
49
50 #ifdef PATH_MAX
51 #define MAX_PATH (PATH_MAX < 4096 ? 4096 : PATH_MAX)
52 #else
53 #define MAX_PATH 4096
54 #endif
55
56 #define u_handle int
57 #define u_valid(fd) ((fd) >= 0)
58
59 #define u_setenv(name,value) setenv (name, value, 1)
60 #define u_mkdir(path) mkdir (path, 0777)
61 #define u_chdir(path) chdir (path)
62 #define u_rename(fr,to) rename (fr, to)
63 #define u_open(path) open (path, O_RDONLY)
64 #define u_creat(path,exec) open (path, O_WRONLY | O_CREAT | O_TRUNC, (exec) ? 0777 : 0666)
65 #define u_close(handle) close (handle)
66 #define u_append(path,add) strcat (strcat (path, "/"), add)
67 #define u_write(handle,data,len) write (handle, data, len)
68
69 // on a mostly idle system, a sync at the end is certainly faster, hope for the best
70 #define u_fsync(handle)
71 #define u_sync() sync ()
72
73#endif
74
75#define u_16(ptr) (((ptr)[0] << 8) | (ptr)[1])
76#define u_32(ptr) (((ptr)[0] << 24) | ((ptr)[1] << 16) | ((ptr)[2] << 8) | (ptr)[3])
77
78static u_handle pack_handle; 50static u_handle pack_handle;
51static u_handle lock_handle;
79static char tmppath[MAX_PATH]; 52static char tmppath[MAX_PATH];
80static char currdir[MAX_PATH];
81static char datadir[MAX_PATH]; // %AppData%/urlader
82static char exe_dir[MAX_PATH]; // %AppData%/urlader/EXE_ID
83static char execdir[MAX_PATH]; // %AppData%/urlader/EXE_ID/EXE_VER
84static char exe_id[MAX_PATH];
85static char exe_ver[MAX_PATH];
86 53
87static int exe_argc; 54static int exe_argc;
88static const char *exe_argv[32]; 55static u_dynbuf exe_argv;
89 56static u_dynbuf exe_args; /* actual arguments strings copied here */
90static void
91fatal (const char *msg)
92{
93#ifdef _WIN32
94 MessageBox (0, msg, URLADER, 0);
95#else
96 fprintf (stderr, "%s: %s\n", URLADER, msg);
97#endif
98
99 _exit (1);
100}
101 57
102static void 58static void
103tmpdir (const char *dir) 59tmpdir (const char *dir)
104{ 60{
105 static int cnt; 61 static int cnt;
… …
116 return; 72 return;
117 } 73 }
118} 74}
119 75
120static void 76static void
121systemv (const char *const argv[], int dowait) 77systemv (const char *const argv[])
122{ 78{
123#ifdef _WIN32 79#ifdef _WIN32
124 _spawnv (P_WAIT, argv [0], argv); 80 _spawnv (P_WAIT, argv [0], argv);
125#else 81#else
126 pid_t pid = dowait ? fork () : 0; 82 pid_t pid = fork ();
127 83
128 if (pid < 0) 84 if (pid < 0)
129 fatal ("fork failure"); 85 u_fatal ("fork failure");
130 86
131 if (!pid) 87 if (!pid)
132 { 88 {
133 execv (argv [0], (void *)argv); 89 execv (argv [0], (void *)argv);
134 _exit (124); 90 _exit (124);
… …
147 const char *argv[] = { getenv ("COMSPEC"), "/c", "rd", "/s", "/q", buf, 0 }; 103 const char *argv[] = { getenv ("COMSPEC"), "/c", "rd", "/s", "/q", buf, 0 };
148 sprintf (buf, "\"%s\"", path); 104 sprintf (buf, "\"%s\"", path);
149 #else 105 #else
150 const char *argv[] = { "/bin/rm", "-rf", path, 0 }; 106 const char *argv[] = { "/bin/rm", "-rf", path, 0 };
151 #endif 107 #endif
152 systemv (argv, 1); 108 systemv (argv);
153} 109}
154
155enum
156{
157 T_NULL, // 5
158 T_META, // 1 : exe_id, exe_ver
159 T_ENV, // 2 : name, value
160 T_ARG, // 3 : arg
161 T_DIR, // 4+: path
162 T_FILE, // 4+: path, data
163 T_NUM
164};
165
166enum
167{
168 F_EXEC = 1,
169 F_LZF = 2,
170 F_NULL = 0
171};
172
173struct hdr
174{
175 unsigned char type;
176 unsigned char flags;
177 unsigned char namelen[2];
178 unsigned char datalen[4];
179};
180
181struct tail {
182 unsigned char max_filesize[4];
183 unsigned char size[4];
184 char magic[12];
185};
186 110
187static char *pack_base, *pack_end; 111static char *pack_base, *pack_end;
112static struct u_pack_tail *pack_tail;
188static struct hdr *pack_cur; 113static struct u_pack_hdr *pack_cur;
189static char *scratch; 114static char *scratch;
190static unsigned int scratch_len; 115static unsigned int scratch_size;
191 116
192#define PACK_NAME ((char *)(pack_cur + 1)) 117#define PACK_NAME ((char *)(pack_cur + 1))
193#define PACK_DATA (PACK_NAME + u_16 (pack_cur->namelen) + 1) 118#define PACK_DATA (PACK_NAME + u_16 (pack_cur->namelen) + 1)
194#define PACK_VALID pack_cur->type 119#define PACK_VALID pack_cur->type
195 120
196static void 121static void
197pack_next (void) 122pack_next (void)
198{ 123{
199 unsigned int d = u_32 (pack_cur->datalen); 124 unsigned int d = u_32 (pack_cur->datalen);
200 125
201 pack_cur = (struct hdr *)(PACK_DATA + d); 126 pack_cur = (struct u_pack_hdr *)(PACK_DATA + d);
202} 127}
203 128
204static void 129static void
205pack_unmap (void) 130pack_unmap (void)
206{ 131{
207 if (!pack_base) 132 if (pack_base)
208 return; 133 {
209
210 free (scratch);
211
212#ifdef _WIN32
213 UnmapViewOfFile (pack_base);
214#else
215 munmap (pack_base, pack_end - pack_base); 134 u_munmap (pack_base, pack_end - pack_base);
216#endif 135 pack_base = 0;
136 }
137
138 if (scratch)
139 {
140 u_free (scratch, scratch_size);
141 scratch = 0;
142 }
217} 143}
218 144
219static int 145static int
220pack_map (void) 146pack_map (void)
221{ 147{
148 char *addr;
149 unsigned int size;
150
222#ifdef _WIN32 151#ifdef _WIN32
223 BY_HANDLE_FILE_INFORMATION fi; 152 BY_HANDLE_FILE_INFORMATION fi;
224 153
225 if (!GetFileInformationByHandle (pack_handle, &fi)) 154 if (!GetFileInformationByHandle (pack_handle, &fi))
226 return 0; 155 return 0;
227 156
228 if (fi.nFileSizeHigh) // too big 157 size = fi.nFileSizeLow;
158#else
159 size = lseek (pack_handle, 0, SEEK_END);
160#endif
161
162 addr = u_mmap (pack_handle, size);
163 if (!addr)
229 return 0; 164 return 0;
230 165
231 HANDLE handle = CreateFileMapping (pack_handle, 0, PAGE_READONLY, 0, fi.nFileSizeLow, NULL); 166 /*pack_unmap ();*/
232 167
233 if (!handle) 168 pack_base = addr;
169 pack_end = pack_base + size;
170
171 pack_tail = (void *)(pack_end - sizeof (*pack_tail));
172
173 if (memcmp (pack_tail->magic, TAIL_MAGIC, sizeof (TAIL_MAGIC) - 1))
234 return 0; 174 return 0;
235 175
236 pack_unmap (); 176 pack_cur = (struct u_pack_hdr *)(pack_end - u_32 (pack_tail->size));
237 177
238 pack_base = MapViewOfFile (handle, FILE_MAP_READ, 0, 0, fi.nFileSizeLow); 178 if (pack_cur->type != T_META)
239
240 CloseHandle (handle);
241
242 pack_end = pack_base + fi.nFileSizeLow;
243#else
244 off_t len = lseek (pack_handle - 1, 0, SEEK_END);
245
246 pack_unmap ();
247
248 pack_base = mmap (0, len, PROT_READ, MAP_SHARED, pack_handle - 1, 0);
249 if (pack_base == (void *)-1)
250 pack_base = 0;
251
252 pack_end = pack_base + len;
253#endif
254
255 if (!pack_base)
256 return 0; 179 return 0;
257 180
258 struct tail *tail; 181 scratch = u_malloc (scratch_size = u_32 (pack_tail->max_uncompressed));
259 182 if (!scratch)
260 tail = (void *)(pack_end - sizeof (*tail));
261
262 if (memcmp (tail->magic, TAIL_MAGIC, sizeof (TAIL_MAGIC) - 1))
263 return 0; 183 return 0;
264 184
265 pack_cur = (struct hdr *)(pack_end - u_32 (tail->size));
266
267 free (scratch);
268 scratch = malloc (scratch_len = u_32 (tail->max_filesize));
269
270 return 1; 185 return 1;
271} 186}
272 187
273static void 188static void
274exe_info (void) 189add_arg (char *arg, unsigned int len)
275{ 190{
276 if (!pack_map ()) 191 char *addr = u_dynbuf_append (&exe_args, arg, len);
277 fatal ("unable to locate packfile in executable - executable corrupted?"); 192 u_dynbuf_append (&exe_argv, &addr, sizeof (addr));
278
279 if (pack_cur->type != T_META)
280 fatal ("unable to locate executable metadata - executable corrupted?");
281
282 strcpy (exe_id, PACK_NAME);
283} 193}
284 194
285static void 195static void
286load (void) 196load (void)
287{ 197{
288 u_mkdir (datadir); 198 strcpy (exe_id , PACK_NAME);
289 199 strcpy (exe_ver, PACK_DATA);
290 strcpy (exe_dir, datadir); 200 u_set_exe_info ();
291 u_append (exe_dir, exe_id);
292 u_mkdir (exe_dir);
293 201
294 if (u_chdir (exe_dir)) 202 if (u_chdir (exe_dir))
295 fatal ("unable to change to application data directory"); 203 u_fatal ("unable to change to application data directory");
296 204
297 u_handle h = u_open ("override"); 205 u_handle h = u_open ("override");
298 if (u_valid (h)) 206 if (u_valid (h))
299 { 207 {
300 u_handle oh = pack_handle; 208 u_handle oh = pack_handle;
301 209
210 pack_unmap ();
302 pack_handle = h; 211 pack_handle = h;
212
303 if (!pack_map ()) 213 if (pack_map ()
214 && strcmp (exe_id , PACK_NAME) == 0
215 && strcmp (exe_ver, PACK_DATA) <= 0)
216 u_setenv ("URLADER_OVERRIDE", "override");
217 else
304 { 218 {
219 pack_unmap ();
305 pack_handle = oh; 220 pack_handle = oh;
306 oh = h; 221 oh = h;
222 pack_map ();
307 } 223 }
308 224
309 u_close (oh); 225 u_close (oh);
310 } 226 }
311 227
312 if (pack_cur->type != T_META)
313 fatal ("unable to locate override metadata");
314
315 strcpy (exe_ver, PACK_DATA); 228 strcpy (exe_ver, PACK_DATA);
229 u_set_exe_info ();
316 pack_next (); 230 pack_next ();
317 231
318 for (;;) 232 for (;;)
319 { 233 {
320 if (pack_cur->type == T_ENV) 234 if (pack_cur->type == T_ENV)
321 u_setenv (PACK_NAME, PACK_DATA); 235 u_setenv (PACK_NAME, PACK_DATA);
322 else if (pack_cur->type == T_ARG) 236 else if (pack_cur->type == T_ARG)
323 exe_argv [exe_argc++] = strdup (PACK_NAME); 237 add_arg (PACK_NAME, u_16 (pack_cur->namelen) + 1);
324 else 238 else
325 break; 239 break;
326 240
327 pack_next (); 241 pack_next ();
328 } 242 }
329 243
330done_env_arg: 244done_env_arg:
331 strcpy (execdir, exe_dir); 245
332 u_append (execdir, "i-"); 246 strcat (strcpy (tmppath, execdir), ".lck");
333 strcat (execdir, exe_ver); 247 lock_handle = u_lock (tmppath, 0, 1);
248 if (!lock_handle)
249 u_fatal ("unable to lock application instance");
334 250
335 if (access (execdir, F_OK)) 251 if (access (execdir, F_OK))
336 { 252 {
337 // does not exist yet, so unpack and move 253 // does not exist yet, so unpack and move
338 tmpdir (exe_dir); 254 tmpdir (exe_dir);
339 255
340 if (u_chdir (tmppath)) 256 if (u_chdir (tmppath))
341 fatal ("unable to change to new instance directory"); 257 u_fatal ("unable to change to new instance directory");
342 258
343 for (;;) 259 for (;;)
344 { 260 {
345 switch (pack_cur->type) 261 switch (pack_cur->type)
346 { 262 {
… …
353 u_handle h = u_creat (PACK_NAME, pack_cur->flags & F_EXEC); 269 u_handle h = u_creat (PACK_NAME, pack_cur->flags & F_EXEC);
354 unsigned int dlen, len = u_32 (pack_cur->datalen); 270 unsigned int dlen, len = u_32 (pack_cur->datalen);
355 char *data = PACK_DATA; 271 char *data = PACK_DATA;
356 272
357 if (pack_cur->flags & F_LZF) 273 if (pack_cur->flags & F_LZF)
358 if (dlen = lzf_decompress (data, len, scratch, scratch_len)) 274 if (dlen = lzf_decompress (data, len, scratch, scratch_size))
359 { 275 {
360 data = scratch; 276 data = scratch;
361 len = dlen; 277 len = dlen;
362 } 278 }
363 else 279 else
364 fatal ("unable to uncompress file data - pack corrupted?"); 280 u_fatal ("unable to uncompress file data - pack corrupted?");
365 281
366 if (!u_valid (h)) 282 if (!u_valid (h))
367 fatal ("unable to unpack file from packfile - disk full?"); 283 u_fatal ("unable to unpack file from packfile - disk full?");
368 284
369 if (u_write (h, data, len) != len) 285 if (u_write (h, data, len) != len)
370 fatal ("unable to unpack file from packfile - disk full?"); 286 u_fatal ("unable to unpack file from packfile - disk full?");
371 287
372 u_fsync (h); 288 u_fsync (h);
373 u_close (h); 289 u_close (h);
374 } 290 }
375 break; 291 break;
… …
381 pack_next (); 297 pack_next ();
382 } 298 }
383 299
384done: 300done:
385 if (u_chdir (datadir)) 301 if (u_chdir (datadir))
386 fatal ("unable to change to data directory"); 302 u_fatal ("unable to change to data directory");
387 303
388 u_sync (); 304 u_sync ();
389 305
390 if (u_rename (tmppath, execdir)) 306 if (u_rename (tmppath, execdir))
391 deltree (tmppath); // if move fails, delete new, assume other process created it independently 307 deltree (tmppath); // if move fails, delete new, assume other process created it independently
… …
393 309
394 pack_unmap (); 310 pack_unmap ();
395 u_close (pack_handle); 311 u_close (pack_handle);
396 312
397 if (u_chdir (execdir)) 313 if (u_chdir (execdir))
398 fatal ("unable to change to application instance directory"); 314 u_fatal ("unable to change to application instance directory");
399 315
400 u_setenv ("URLADER_VERSION", URLADER_VERSION); 316 u_setenv ("URLADER_VERSION", URLADER_VERSION);
401 u_setenv ("URLADER_DATADIR", datadir);
402 u_setenv ("URLADER_EXECDIR", execdir);
403 u_setenv ("URLADER_EXE_ID" , exe_id);
404 u_setenv ("URLADER_EXE_DIR", exe_dir);
405 u_setenv ("URLADER_EXE_VER", exe_ver);
406 317
407#if 0 318#if 0
408 // yes, this is overkill 319 // yes, this is overkill
409 u_setenv ("SHLIB_PATH" , execdir); // hpux 320 u_setenv ("SHLIB_PATH" , execdir); // hpux
410 u_setenv ("LIBPATH" , execdir); // aix 321 u_setenv ("LIBPATH" , execdir); // aix
… …
418} 329}
419 330
420static void 331static void
421execute (void) 332execute (void)
422{ 333{
423 exe_argv [exe_argc] = 0; 334 char *null = 0;
424 systemv (exe_argv, 0); 335 u_dynbuf_append (&exe_argv, &null, sizeof (null));
336 systemv ((const char *const *)exe_argv.addr);
337}
338
339// this argc/argv is without argv [0]
340static void
341doit (int argc, char *argv[])
342{
343 int i;
344
345 u_setenv ("URLADER_CURRDIR", currdir);
346
347 u_set_datadir ();
348 u_mkdir (datadir);
349
350 if (!pack_map ())
351 u_fatal ("unable to map pack file - executable corrupted?");
352
353 load ();
354
355 while (argc--)
356 {
357 add_arg (*argv, strlen (*argv) + 1);
358 ++argv;
359 }
360
361 execute ();
425} 362}
426 363
427#ifdef _WIN32 364#ifdef _WIN32
428 365
429int APIENTRY 366int APIENTRY
430WinMain (HINSTANCE hI, HINSTANCE hP, LPSTR argv, int command_show) 367WinMain (HINSTANCE hI, HINSTANCE hP, LPSTR argv, int command_show)
431{ 368{
432 if (!GetModuleFileName (hI, tmppath, sizeof (tmppath))) 369 if (!GetModuleFileName (hI, tmppath, sizeof (tmppath)))
433 fatal ("unable to find executable pack"); 370 u_fatal ("unable to find executable pack");
371
372 u_setenv ("URLADER_EXEPATH", tmppath);
434 373
435 pack_handle = u_open (tmppath); 374 pack_handle = u_open (tmppath);
436 if (!u_valid (pack_handle)) 375 if (!u_valid (pack_handle))
437 fatal ("unable to open executable pack"); 376 u_fatal ("unable to open executable pack");
438
439 exe_info ();
440 377
441 if (!GetCurrentDirectory (sizeof (currdir), currdir)) 378 if (!GetCurrentDirectory (sizeof (currdir), currdir))
442 strcpy (currdir, "."); 379 strcpy (currdir, ".");
443 380
444 if (SHGetFolderPath (0, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, datadir) != S_OK) 381 doit (1, &argv);
445 fatal ("unable to find application data directory");
446
447 u_mkdir (datadir);
448 u_append (datadir, URLADER);
449
450 load ();
451 execute ();
452 382
453 return 0; 383 return 0;
454} 384}
455 385
456#else 386#else
457 387
458int 388int
459main (int argc, char *argv[]) 389main (int argc, char *argv[])
460{ 390{
461 char *home = getenv ("HOME");
462
463 pack_handle = u_open (argv [0]);
464 if (!u_valid (pack_handle))
465 fatal ("unable to open executable pack");
466
467 exe_info ();
468
469 if (!home)
470 {
471 struct passwd *pw;
472
473 if ((pw = getpwuid (getuid ())))
474 home = pw->pw_dir;
475 else
476 home = "/tmp";
477 }
478
479 if (!getcwd (currdir, sizeof (currdir))) 391 if (!getcwd (currdir, sizeof (currdir)))
480 strcpy (currdir, "."); 392 strcpy (currdir, ".");
481 393
482 u_mkdir (home); 394 {
483 sprintf (datadir, "%s/.%s", home, URLADER); 395 const char *exe_path = 0;
484 u_mkdir (datadir); 396
397 if (strchr (argv [0], '/'))
398 exe_path = argv [0];
399 else
400 {
401 const char *p, *path = getenv ("PATH");
402
403 if (!path)
404 u_fatal ("unable to find executable, try running with full path.");
405
406 for (p = path; ; )
407 {
408 const char *e = p;
409 int l;
410
411 while (*e && *e != ':')
412 ++e;
413
414 l = e - p;
415 memcpy (tmppath, p, l);
416
417 if (!l)
418 tmppath [l++] = '.';
419
420 tmppath [l++] = '/';
421
422 strcpy (tmppath + l, argv [0]);
423
424 if (!access (tmppath, X_OK))
425 break;
426
427 p = e;
428 if (!*p)
429 u_fatal ("unable to find executable, try running with full path.");
430
431 ++p;
432 }
433
434 exe_path = tmppath;
435 }
436
437 pack_handle = u_open (exe_path);
438 if (!u_valid (pack_handle))
439 u_fatal ("unable to open executable for reading - permissions problem?");
440
441 u_setenv ("URLADER_EXEPATH", exe_path);
442 }
485 443
486#if 0 444#if 0
445 /* intersperse hostname, for whatever reason */
446
487 if (gethostname (tmppath, sizeof (tmppath))) 447 if (gethostname (tmppath, sizeof (tmppath)))
488 strcpy (tmppath, "default"); 448 strcpy (tmppath, "default");
489 449
490 u_append (datadir, tmppath); 450 u_append (datadir, tmppath);
491#endif 451#endif
492 452
493 load (); 453 doit (argc - 1, argv + 1);
494 execute ();
495 454
496 return 0; 455 return 0;
497} 456}
498 457
499#endif 458#endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines