Changeset 3185 in MondoRescue for branches/3.0/mondo/src/common/libmondo-cli.c

Timestamp:

Sep 20, 2013, 2:29:57 PM (11 years ago)

Author:

Bruno Cornec

Message:

Simplify the interface of mr_getline and mr_asprintf. With 3.1 compatibility now will allow backports from this branch into 3.0

File:

• branches/3.0/mondo/src/common/libmondo-cli.c (modified) (13 diffs)

branches/3.0/mondo/src/common/libmondo-cli.c

@@ -97 +97 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            mr_asprintf(&tmp, "-%c %s", i, flag_val[i]);
+            mr_asprintf(tmp, "-%c %s", i, flag_val[i]);
             log_msg(3, tmp);
             mr_free(tmp);
@@ -246 +246 @@
         }
 
-        mr_asprintf(&tmp1, "%s", flag_val['I']);
+        mr_asprintf(tmp1, "%s", flag_val['I']);
         p = tmp1;
         q = tmp1;
@@ -448 +448 @@
         if (p == NULL) {
             /* protocol not found assuming NFS for compatibility */
-            mr_asprintf(&q,"nfs");
+            mr_asprintf(q,"nfs");
 
             p = strchr(bkpinfo->netfs_mount, ':');
@@ -460 +460 @@
             /* Isolate the protocol */
             *p = '\0';
-            mr_asprintf(&q,"%s",bkpinfo->netfs_mount);
+            mr_asprintf(q,"%s",bkpinfo->netfs_mount);
 
             /* Skip proto now */
@@ -484 +484 @@
             p--;
             *p = '\0';
-            mr_asprintf(&q,"%s",bkpinfo->netfs_mount);
+            mr_asprintf(q,"%s",bkpinfo->netfs_mount);
             bkpinfo->netfs_user = q;
             strcpy(bkpinfo->netfs_mount,tmp);
@@ -578 +578 @@
     if (flag_set['z']) {
         if (find_home_of_exe("getfattr")) {
-            mr_asprintf(&g_getfattr,"getfattr");
+            mr_asprintf(g_getfattr,"getfattr");
         }
         if (find_home_of_exe("getfacl")) {
-            mr_asprintf(&g_getfacl,"getfacl");
+            mr_asprintf(g_getfacl,"getfacl");
         }
     }
@@ -595 +595 @@
             log_to_screen("Please supply a sensible value with '-E'\n");
         }
-        mr_asprintf(&tmp1, "%s", flag_val['E']);
+        mr_asprintf(tmp1, "%s", flag_val['E']);
 
         p = tmp1;
@@ -656 +656 @@
 
     if (flag_set['b']) {
-        mr_asprintf(&psz, "%s", flag_val['b']);
+        mr_asprintf(psz, "%s", flag_val['b']);
         log_msg(1, "psz = '%s'", psz);
         if (psz[strlen(psz) - 1] == 'k') {
@@ -730 +730 @@
 
     if ((flag_set['n']) && (! bkpinfo->restore_data)) {
-        mr_asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->netfs_remote_dir);
+        mr_asprintf(tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->netfs_remote_dir);
         if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
             sprintf(tmp, "su - %s -c \"echo hi > %s\"", bkpinfo->netfs_user, tmp1);
@@ -1003 +1003 @@
             if (flag_set[opt]) {
                 bad_switches = TRUE;
-                mr_asprintf(&tmp, "Switch -%c previously defined as %s\n", opt, flag_val[opt]);
+                mr_asprintf(tmp, "Switch -%c previously defined as %s\n", opt, flag_val[opt]);
                 log_to_screen(tmp);
                 paranoid_free(tmp);
@@ -1019 +1019 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            mr_asprintf(&tmp, "-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
+                            mr_asprintf(tmp, "-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
                             log_to_screen(tmp);
                             paranoid_free(tmp);
@@ -1032 +1032 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        mr_asprintf(&tmp, "Invalid arg -- %s\n", argv[i]);
+        mr_asprintf(tmp, "Invalid arg -- %s\n", argv[i]);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -1063 +1063 @@
     switch (sig) {
     case SIGINT:
-        mr_asprintf(&tmp, "SIGINT");
-        mr_asprintf(&tmp2, "You interrupted me :-)");
+        mr_asprintf(tmp, "SIGINT");
+        mr_asprintf(tmp2, "You interrupted me :-)");
         break;
     case SIGKILL:
-        mr_asprintf(&tmp, "SIGKILL");
-        mr_asprintf(&tmp2, "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
+        mr_asprintf(tmp, "SIGKILL");
+        mr_asprintf(tmp2, "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
         break;
     case SIGTERM:
-        mr_asprintf(&tmp, "SIGTERM");
-        mr_asprintf(&tmp2, "Got terminate signal");
+        mr_asprintf(tmp, "SIGTERM");
+        mr_asprintf(tmp2, "Got terminate signal");
         break;
     case SIGHUP:
-        mr_asprintf(&tmp, "SIGHUP");
-        mr_asprintf(&tmp2, "Hangup on line");
+        mr_asprintf(tmp, "SIGHUP");
+        mr_asprintf(tmp2, "Hangup on line");
         break;
     case SIGSEGV:
-        mr_asprintf(&tmp, "SIGSEGV");
-        mr_asprintf(&tmp2, "Internal programming error. Please send a backtrace as well as your log.");
+        mr_asprintf(tmp, "SIGSEGV");
+        mr_asprintf(tmp2, "Internal programming error. Please send a backtrace as well as your log.");
         break;
     case SIGPIPE:
-        mr_asprintf(&tmp, "SIGPIPE");
-        mr_asprintf(&tmp2, "Pipe was broken");
+        mr_asprintf(tmp, "SIGPIPE");
+        mr_asprintf(tmp2, "Pipe was broken");
         break;
     case SIGABRT:
-        mr_asprintf(&tmp, "SIGABRT");
-        mr_asprintf(&tmp2, "Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message.");
+        mr_asprintf(tmp, "SIGABRT");
+        mr_asprintf(tmp2, "Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message.");
         break;
     default:
-        mr_asprintf(&tmp, "(Unknown)");
-        mr_asprintf(&tmp2, "(Unknown)");
+        mr_asprintf(tmp, "(Unknown)");
+        mr_asprintf(tmp2, "(Unknown)");
     }