Add a third default.

[oweals/gnunet.git] / src / util / os_installation.c

diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 06eb4ed606d1e3ae31199d7005d0348f06bdc5ea..a94798d8d4c36b812aae6fb1df3a5ca141b14741 100644 (file)
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -43,6 +43,7 @@
 
 #define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
 
+
 #if LINUX
 /**
  * Try to determine path by reading /proc/PID/exe
@@ -115,12 +116,13 @@ get_path_from_proc_exe ()
 }
 #endif
 
-#if WINDOWS
 
+#if WINDOWS
 static HINSTANCE dll_instance;
 
 
-/* GNUNET_util_cl_init() in common_logging.c is preferred.
+/**
+ * GNUNET_util_cl_init() in common_logging.c is preferred.
  * This function is only for thread-local storage (not used in GNUnet)
  * and hInstance saving.
  */
@@ -226,6 +228,7 @@ get_path_from_module_filename ()
 }
 #endif
 
+
 #if DARWIN
 /**
  * Signature of the '_NSGetExecutablePath" function.
@@ -415,8 +418,7 @@ os_get_gnunet_path ()
     return ret;
   /* other attempts here */
   LOG (GNUNET_ERROR_TYPE_ERROR,
-       _
-       ("Could not determine installation path for %s.  Set `%s' environment variable.\n"),
+       _("Could not determine installation path for %s.  Set `%s' environment variable.\n"),
        "GNUnet", "GNUNET_PREFIX");
   return NULL;
 }
@@ -452,7 +454,7 @@ os_get_exec_path ()
 
 /**
  * @brief get the path to a specific GNUnet installation directory or,
- * with GNUNET_IPK_SELF_PREFIX, the current running apps installation directory
+ * with #GNUNET_OS_IPK_SELF_PREFIX, the current running apps installation directory
  * @author Milan
  * @return a pointer to the dir path (to be freed by the caller)
  */
@@ -657,9 +659,9 @@ GNUNET_OS_get_libexec_binary_path (const char *progname)
  *             binary with the -d flag. -d omits a programs main loop and only
  *             executes all privileged operations in an binary.
  * @param params parameters used for w32 privilege checking (can be NULL for != w32 )
- * @return GNUNET_YES if the file is SUID (*nix) or can be executed with current privileges (W32),
- *         GNUNET_NO if not SUID (but binary exists),
- *         GNUNET_SYSERR on error (no such binary or not executable)
+ * @return #GNUNET_YES if the file is SUID (*nix) or can be executed with current privileges (W32),
+ *         #GNUNET_NO if not SUID (but binary exists),
+ *         #GNUNET_SYSERR on error (no such binary or not executable)
  */
 int
 GNUNET_OS_check_helper_binary (const char *binary, int check_suid, const char *params)
@@ -704,7 +706,8 @@ GNUNET_OS_check_helper_binary (const char *binary, int check_suid, const char *p
 #endif
   if (NULL == p)
   {
-    LOG (GNUNET_ERROR_TYPE_INFO, _("Could not find binary `%s' in PATH!\n"),
+    LOG (GNUNET_ERROR_TYPE_INFO,
+         _("Could not find binary `%s' in PATH!\n"),
          binary);
     return GNUNET_SYSERR;
   }
@@ -741,16 +744,16 @@ GNUNET_OS_check_helper_binary (const char *binary, int check_suid, const char *p
     char parameters[512];
     PROCESS_INFORMATION proc;
     DWORD exit_value;
-    
-    GNUNET_snprintf (parameters, 
-                    sizeof (parameters), 
+
+    GNUNET_snprintf (parameters,
+                    sizeof (parameters),
                     "-d %s", params);
     memset (&start, 0, sizeof (start));
     start.cb = sizeof (start);
     memset (&proc, 0, sizeof (proc));
 
-            
-    // Start the child process. 
+
+    // Start the child process.
     if ( ! (CreateProcess( p,   // current windows (2k3 and up can handle / instead of \ in paths))
         parameters,           // execute dryrun/priviliege checking mode
         NULL,           // Process handle not inheritable
@@ -758,12 +761,12 @@ GNUNET_OS_check_helper_binary (const char *binary, int check_suid, const char *p
         FALSE,          // Set handle inheritance to FALSE
         CREATE_DEFAULT_ERROR_MODE, // No creation flags
         NULL,           // Use parent's environment block
-        NULL,           // Use parent's starting directory 
+        NULL,           // Use parent's starting directory
         &start,            // Pointer to STARTUPINFO structure
         &proc )           // Pointer to PROCESS_INFORMATION structure
-                               )) 
+                               ))
       {
-        LOG (GNUNET_ERROR_TYPE_ERROR, 
+        LOG (GNUNET_ERROR_TYPE_ERROR,
              _("CreateProcess failed for binary %s (%d).\n"),
              p, GetLastError());
         return GNUNET_SYSERR;
@@ -771,17 +774,17 @@ GNUNET_OS_check_helper_binary (const char *binary, int check_suid, const char *p
 
     // Wait until child process exits.
     WaitForSingleObject( proc.hProcess, INFINITE );
-    
+
     if ( ! GetExitCodeProcess (proc.hProcess, &exit_value)){
-        LOG (GNUNET_ERROR_TYPE_ERROR, 
-             _("GetExitCodeProcess failed for binary %s (%d).\n"), 
+        LOG (GNUNET_ERROR_TYPE_ERROR,
+             _("GetExitCodeProcess failed for binary %s (%d).\n"),
              p, GetLastError() );
         return GNUNET_SYSERR;
       }
-    // Close process and thread handles. 
+    // Close process and thread handles.
     CloseHandle( proc.hProcess );
     CloseHandle( proc.hThread );
-  
+
     if (!exit_value)
       return GNUNET_YES;
 #endif