Changeset 1193 in MondoRescue

Timestamp:

Feb 20, 2007, 12:24:22 PM (18 years ago)

Author:

Bruno Cornec

Message:

Remove some useless \r in code
Remove center_string usage as it's now broiken for dynamically created strings

Location:

branches/stable

Files:

• mindi/mindi (modified) (4 diffs)
• mindi/rootfs/sbin/init (modified) (1 diff)
• mindi/rootfs/sbin/install-additional-tools (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (2 diffs)
• mondo/src/common/newt-specific.c (modified) (10 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (1 diff)
• mondo/src/restore-scripts/mondo/restore-bigfiles-from-iso (modified) (1 diff)

branches/stable/mindi/mindi

@@ -344 +344 @@
         Die "Please install either fdformat or superformat."
     fi
-    echo -en "\rWriting $comment"
+    echo -en "\nWriting $comment"
     if echo $image | grep "mindi-[r|b]oot\.1440" &> /dev/null ; then
         cat $image > $dev &
@@ -1145 +1145 @@
     [ "$mountlist" != "" ] && rm -Rf $mountlist
     > $mountlist
-    echo -en "\rHang on...\r"
     all_partitions=""
     
     if [ $LVM != "false" ]; then
-        echo -en "\rAnalyzing LVM...\r"
+        echo -en "Analyzing LVM...\n"
         $MINDI_LIB/analyze-my-lvm > $MINDI_TMP/lvm.res
         if [ $? -ne 0 ]; then
@@ -2062 +2061 @@
     rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
     if [ "$retval" -eq "0" ] ; then
-        echo -en "...$DONE\r"
+        echo -en "...$DONE\n"
         if [ "$KERN_DISK_MADE" ] ; then
-            LogIt "... $disksize KB boot disks were created OK\r"
-        fi
-    else
-        echo -en "...failed\r"
-        LogIt $disksize"KB boot disk was NOT created\r"
+            LogIt "$disksize KB boot disks were created OK\n"
+        fi
+    else
+        echo -en "...failed\n"
+        LogIt $disksize"KB boot disk was NOT created\n"
         rm -f $imagefile
     fi
@@ -2167 +2166 @@
 
     if [ "$retval" -eq "0" ] ; then
-        echo -en "...$DONE\r"
+        echo -en "...$DONE\n"
         if [ "$KERN_DISK_MADE" ] ; then
             rm -f $imagefile
-            LogIt "... $disksize KB boot disks were created OK\r"
-        fi
-    else
-        echo -en "...failed\r"
-        LogIt $disksize"KB boot disk was NOT created\r"
+            LogIt "$disksize KB boot disks were created OK\n"
+        fi
+    else
+        echo -en "...failed\n"
+        LogIt $disksize"KB boot disk was NOT created\n"
         rm -f $imagefile
     fi

branches/stable/mindi/rootfs/sbin/init

@@ -539 +539 @@
     LogIt "I think this CD/floppy has no archives on it."
 fi
-echo -en "Type 'exit' to reboot the PC\r"
+echo -en "Type 'exit' to reboot the PC\n"
 umount /mnt/cdrom 2> /dev/null
 mount / -o rw,remount > /dev/null 2> /dev/null

branches/stable/mindi/rootfs/sbin/install-additional-tools

@@ -43 +43 @@
     biggiefsize=`cat $stub.size`
     rm -f $stub.name $stub.size
-#    echo -e -n "\rRecombining #$biggienumber ($biggiefname)        \r"
     > /tmp/out.dat
     sliceno=0

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

@@ -18 +18 @@
 
 #include "my-stuff.h"
-#include "../common/mondostructures.h"
+#include "mondostructures.h"
 #include "mr_conf.h"
 #include "mr_mem.h"
@@ -3506 +3506 @@
     mr_asprintf(&tmp, "Writing the final ISO");
     mr_msg(2, tmp);
+    /* BERLIOS: Doesn't work on allocated chains anymore
     center_string(tmp, 80);
+    */
 #ifndef _XWIN
     if (!g_text_mode) {

branches/stable/mondo/src/common/newt-specific.c

@@ -129 +129 @@
             sync();
             printf
-                ("---promptdialogYN---1--- %s\r\n---promptdialogYN---Q--- [yes] [no] ---\r\n--> ",
+                ("---promptdialogYN---1--- %s\n---promptdialogYN---Q--- [yes] [no] ---\n--> ",
                  prompt);
             mr_getline(&tmp, &n, stdin);
@@ -173 +173 @@
         sync();
         printf
-            ("---promptdialogOKC---1--- %s\r\n---promptdialogOKC---Q--- [OK] [Cancel] ---\r\n--> ",
+            ("---promptdialogOKC---1--- %s\n---promptdialogOKC---Q--- [OK] [Cancel] ---\n--> ",
              prompt);
         mr_getline(&tmp, &n, stdin);
@@ -558 +558 @@
     } else {
         mr_asprintf(&tmp, title);
+        /* BERLIOS: Doesn't work on allocated chains anymore
         center_string(tmp, 80);
+        */
         newtPushHelpLine(tmp);
         mr_free(tmp);
     }
+    /* BERLIOS: Doesn't work on allocated chains anymore
     center_string(g_isoform_header_str, 36);
+    */
     g_isoform_starttime = get_time();
     if (g_text_mode) {
@@ -614 +618 @@
     mr_asprintf(&blurb3, b3);
     mr_asprintf(&b1c, b1);
+    /* BERLIOS: Doesn't work for allocated chains anymore
     center_string(b1c, 80);
+    */
     if (max_val <= 0) {
         max_val = 1;
@@ -665 +671 @@
     if (g_text_mode) {
         printf
-            ("---promptpopup---1--- %s\r\n---promptpopup---Q--- [OK] ---\r\n--> ",
+            ("---promptpopup---1--- %s\n---promptpopup---Q--- [OK] ---\n--> ",
              prompt);
         while (((ch = getchar()) != '\n') && (ch != EOF));
@@ -707 +713 @@
     if (g_text_mode) {
         printf
-            ("---promptstring---1--- %s\r\n---promptstring---2--- %s\r\n---promptstring---Q---\r\n-->  ",
+            ("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q---\n-->  ",
              title, b);
         (void) fgets(output, maxsize, stdin);
@@ -732 +738 @@
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, text, type_here, b_1, b_2, NULL);
+    /* BERLIOS: Doesn't work on allocated chains anymore
     center_string(blurb, 80);
+    */
     newtPushHelpLine(blurb);
     mr_free(blurb);
@@ -814 +822 @@
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, text, b_1, b_2, NULL);
+    /* BERLIOS: Doesn't work on allocated chains anymore
     center_string(prompt, 80);
+    */
     newtPushHelpLine(prompt);
     mr_free(prompt);
@@ -968 +978 @@
                 mr_strcat(taskprogress, tmp1);
                 mr_free(tmp1);
-                printf("---evalcall---1--- %s\r\n",
-                       g_isoform_header_str);
-                printf("---evalcall---2--- %s\r\n", taskprogress);
-                printf("---evalcall---E---\r\n");
+                printf("---evalcall------ %s\n", taskprogress);
                 mr_free(taskprogress);
             }
@@ -1095 +1102 @@
         mr_free(taskprogress);
     } else {
+        /* BERLIOS: Doesn't work on allocated chains anymore
         center_string(blurb1, 54);
+        */
+        /* BERLIOS: Doesn't work on allocated chains anymore
         center_string(blurb2, 54);
+        */
+        /* BERLIOS: Doesn't work on allocated chains anymore
         center_string(blurb3, 54);
+        */
         newtLabelSetText(g_blurb1, blurb1);
         newtLabelSetText(g_blurb2, blurb3);

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -2888 +2888 @@
    **************************************************************************/
     if (getuid() != 0) {
-        fprintf(stderr, "Please run as root.\r\n");
+        fprintf(stderr, "Please run as root.\n");
         exit(127);
     }

branches/stable/mondo/src/restore-scripts/mondo/restore-bigfiles-from-iso

@@ -38 +38 @@
     cd $restorepath
     for slicename in `find $MOUNTPT/archives | grep "slice-" | sort` ; do
-#        echo -en "Slice = $slicename    \r"
         echo -en "."
         if echo "$slicename" | grep "slice-[0-9]*.00000\.dat" 2> /dev/null; then