[ViewVC] Diff of: cvs/Urlader/urlader.c

Comparing Urlader/urlader.c (file contents):
Revision 1.2 by root, Thu Dec 29 10:20:56 2011 UTC vs.
Revision 1.5 by root, Fri Dec 30 09:34:20 2011 UTC

 #ifndef URLADER
 # define URLADER "urlader"
 #endif
-#define URLADER_VERSION "1.0"
+#define URLADER_VERSION "1.0" // a decimal number, not a version string
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
    #include <wininet.h>
    static DWORD dword;
    #define u_handle HANDLE
+   #define u_valid(handle) (!!handle)
    #define u_setenv(name,value) SetEnvironmentVariable (name, value)
    #define u_mkdir(path) !CreateDirectory (path, NULL)
    #define u_chdir(path) !SetCurrentDirectory (path)
    #define u_rename(fr,to) !MoveFile (fr, to)
    #define u_open(path) CreateFile (path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL)
    #define u_creat(path,exec) CreateFile (path, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL)
    #define u_close(handle) CloseHandle (handle)
    #define u_append(path,add) PathAppend (path, add)
    #define u_write(handle,data,len) (WriteFile (handle, data, len, &dword, 0) ? dword : -1)
+   #define u_fsync(handle) FlushFileBuffers (handle)
+   #define u_sync()
 #else
    #include <sys/mman.h>
    #include <sys/types.h>
    #include <pwd.h>
    #else
      #define MAX_PATH 4096
    #endif
    #define u_handle int
+   #define u_valid(fd) ((fd) >= 0)
    #define u_setenv(name,value) setenv (name, value, 1)
    #define u_mkdir(path) mkdir (path, 0777)
    #define u_chdir(path) chdir (path)
    #define u_rename(fr,to) rename (fr, to)
-   #define u_open(path) open (path, O_RDONLY) + 1
+   #define u_open(path) open (path, O_RDONLY)
-   #define u_creat(path,exec) open (path, O_WRONLY | O_CREAT | O_TRUNC, (exec) ? 0777 : 0666) + 1
+   #define u_creat(path,exec) open (path, O_WRONLY | O_CREAT | O_TRUNC, (exec) ? 0777 : 0666)
-   #define u_close(handle) close (handle - 1)
+   #define u_close(handle) close (handle)
    #define u_append(path,add) strcat (strcat (path, "/"), add)
-   #define u_write(handle,data,len) write ((handle) - 1, data, len)
+   #define u_write(handle,data,len) write (handle, data, len)
+   // on a mostly idle system, a sync at the end is certainly faster, hope for the best
+   #define u_fsync(handle)
+   #define u_sync() sync ()
 #endif
 #define u_16(ptr) (((ptr)[0] << 8) | (ptr)[1])
 #define u_32(ptr) (((ptr)[0] << 24) | ((ptr)[1] << 16) | ((ptr)[2] << 8) | (ptr)[3])
 enum
 {
   T_NULL, // 5
   T_META, // 1 : exe_id, exe_ver
-  T_ARG,  // 2 : arg
-  T_ENV,  // 3 : name, value
+  T_ENV,  // 2 : name, value
+  T_ARG,  // 3 : arg
   T_DIR,  // 4+: path
   T_FILE, // 4+: path, data
   T_NUM
 };
   if (u_chdir (exe_dir))
     fatal ("unable to change to application data directory");
   u_handle h = u_open ("override");
-  if (h)
+  if (u_valid (h))
     {
       u_handle oh = pack_handle;
       pack_handle = h;
       if (!pack_map ())
     fatal ("unable to locate override metadata");
   strcpy (exe_ver, PACK_DATA);
   pack_next ();
-  while (pack_cur->type == T_ARG)
+  for (;;)
     {
+      if (pack_cur->type == T_ENV)
+        u_setenv (PACK_NAME, PACK_DATA);
+      else if (pack_cur->type == T_ARG)
-      exe_argv [exe_argc++] = strdup (PACK_NAME);
+        exe_argv [exe_argc++] = strdup (PACK_NAME);
+      else
+        break;
       pack_next ();
     }
-  while (pack_cur->type == T_ENV)
+done_env_arg:
-    {
-      u_setenv (PACK_NAME, PACK_DATA);
-      pack_next ();
-    }
   strcpy (execdir, exe_dir);
   u_append (execdir, "i-");
   strcat (execdir, exe_ver);
   if (access (execdir, F_OK))
                         len  = dlen;
                       }
                     else
                       fatal ("unable to uncompress file data - pack corrupted?");
-                  if (!h)
+                  if (!u_valid (h))
                     fatal ("unable to unpack file from packfile - disk full?");
                   if (u_write (h, data, len) != len)
                     fatal ("unable to unpack file from packfile - disk full?");
+                  u_fsync (h);
                   u_close (h);
                 }
                 break;
               case T_NULL:
         }
 done:
       if (u_chdir (datadir))
         fatal ("unable to change to data directory");
+      u_sync ();
       if (u_rename (tmppath, execdir))
         deltree (tmppath); // if move fails, delete new, assume other process created it independently
     }
   u_setenv ("URLADER_EXECDIR", execdir);
   u_setenv ("URLADER_EXE_ID" , exe_id);
   u_setenv ("URLADER_EXE_DIR", exe_dir);
   u_setenv ("URLADER_EXE_VER", exe_ver);
+#if 0
   // yes, this is overkill
   u_setenv ("SHLIB_PATH"        , execdir); // hpux
   u_setenv ("LIBPATH"           , execdir); // aix
   u_setenv ("LD_LIBRARY_PATH"   , execdir); // most elf systems
   u_setenv ("LD_LIBRARY_PATH_32", execdir); // solaris
   u_setenv ("LD_LIBRARY_PATH_64", execdir); // solaris
   u_setenv ("LD_LIBRARYN32_PATH", execdir); // irix
   u_setenv ("LD_LIBRARY64_PATH" , execdir); // irix
   u_setenv ("DYLD_LIBRARY_PATH" , execdir); // os sucks from apple
+#endif
 }
 static void
 execute (void)
 {
 WinMain (HINSTANCE hI, HINSTANCE hP, LPSTR argv, int command_show)
 {
   if (!GetModuleFileName (hI, tmppath, sizeof (tmppath)))
     fatal ("unable to find executable pack");
-  if (!(pack_handle = u_open (tmppath)))
+  pack_handle = u_open (tmppath);
+  if (!u_valid (pack_handle))
     fatal ("unable to open executable pack");
   exe_info ();
   if (!GetCurrentDirectory (sizeof (currdir), currdir))
 int
 main (int argc, char *argv[])
 {
   char *home = getenv ("HOME");
-  // we assume fd 0 and 2 are "normal"
-  if (!(pack_handle = u_open (argv [0])))
+  pack_handle = u_open (argv [0]);
+  if (!u_valid (pack_handle))
     fatal ("unable to open executable pack");
   exe_info ();
   if (!home)
   u_mkdir (home);
   sprintf (datadir, "%s/.%s", home, URLADER);
   u_mkdir (datadir);
+#if 0
   if (gethostname (tmppath, sizeof (tmppath)))
     strcpy (tmppath, "default");
   u_append (datadir, tmppath);
+#endif
   load ();
   execute ();
   return 0;

Diff Legend

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

Comparing Urlader/urlader.c (file contents): Revision 1.2 by root, Thu Dec 29 10:20:56 2011 UTC vs. Revision 1.5 by root, Fri Dec 30 09:34:20 2011 UTC

Diff Legend

Comparing Urlader/urlader.c (file contents):
Revision 1.2 by root, Thu Dec 29 10:20:56 2011 UTC vs.
Revision 1.5 by root, Fri Dec 30 09:34:20 2011 UTC