Changeset 1152 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

Feb 12, 2007, 11:49:41 PM (17 years ago)

Author:

Bruno Cornec

Message:

More memory updates around mondoarchive (addition of mr_setenv) (based on ideas sent as patches by Michel)

Location:

branches/stable/mondo/src/common

Files:

• libmondo-archive-EXT.h (modified) (1 diff)
• libmondo-archive.c (modified) (2 diffs)
• libmondo-tools.c (modified) (3 diffs)

branches/stable/mondo/src/common/libmondo-archive-EXT.h

@@ -41 +41 @@
                                           char *filelist, char *fname,
                                           int setno);
-extern void setenv_mondo_share(void);
+extern void setenv_mondo_var(void);

branches/stable/mondo/src/common/libmondo-archive.c

@@ -14 +14 @@
 #include <sys/ipc.h>
 #include <stdarg.h>
+#include <stdlib.h>
 #include <unistd.h>
 
@@ -3939 +3940 @@
 /* @} - end of utilityGroup */
 
-void setenv_mondo_share(void) {
-
-setenv("MONDO_SHARE", MONDO_SHARE, 1);
-setenv("MONDORESTORECFG", MONDORESTORECFG, 1);
-setenv("MONDO_CACHE", MONDO_CACHE, 1);
+void setenv_mondo_var(void) {
+
+    char *tmp = NULL;
+    char *p = NULL;
+    char *path_min = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin";
+
+    mr_setenv("MONDO_SHARE",MONDO_SHARE);
+    mr_setenv("MONDORESTORECFG",MONDORESTORECFG);
+    mr_setenv("MONDO_CACHE",MONDO_CACHE);
+
+    if ((p = getenv("PATH")) == NULL) {
+        mr_asprintf(&p,path_min);
+    }
+    mr_asprintf(&tmp, "%s:%s",p, path_min);
+    mr_free(p);
+    mr_setenv("PATH",tmp);
+    mr_free(tmp);
 }

branches/stable/mondo/src/common/libmondo-tools.c

@@ -197 +197 @@
 
 
-char *get_architecture()
+char *get_architecture(void)
 {
 #ifdef __IA32__
@@ -210 +210 @@
 
 
-double get_kernel_version()
+double get_kernel_version(void)
 {
     char *p, tmp[200];
@@ -244 +244 @@
  * @return number of seconds since the epoch.
  */
-long get_time()
+long get_time(void)
 {
     return (long) time((void *) 0);