From e2e793ed4b0bc90199e4315890cf1c20778f83dd Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Thu, 15 May 2008 09:20:05 +0000
Subject: [PATCH] Enabled a pacifier for compare_r

---
 libisoburn/trunk/xorriso/xorriso.c           | 24 ++++++++++++++------
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/libisoburn/trunk/xorriso/xorriso.c b/libisoburn/trunk/xorriso/xorriso.c
index f29c9f00..054df035 100644
--- a/libisoburn/trunk/xorriso/xorriso.c
+++ b/libisoburn/trunk/xorriso/xorriso.c
@@ -3236,6 +3236,7 @@ int Xorriso_pacifier_reset(struct XorrisO *xorriso, int flag)
                          Ignored if "".
    @param flag  bit0= report unconditionally, no time check
                 bit1= report count <=0 (no thank you for being patient then)
+                bit6= report with carriage return rather than line feed
 */
 int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done,
                               off_t count, off_t todo, char *current_object,
@@ -3260,8 +3261,8 @@ int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done,
      sprintf(count_text, "%.f", (double) count);
    else
      Sfile_scale((double) count, count_text, 7, 1e5, 1);
-   sprintf(xorriso->info_text,
-           "%s %s in %.f seconds", count_text, what_done, since);
+   sprintf(xorriso->info_text, "%s %s in %.f %s",
+           count_text, what_done, since, (flag&64) ? "s" : "seconds");
  } else {
    sprintf(xorriso->info_text, "%.f of %.f %s in %.f seconds",
            (double) count, (double) todo, what_done, since);
@@ -3269,7 +3270,7 @@ int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done,
  if(current_object[0]!=0)
    sprintf(xorriso->info_text+strlen(xorriso->info_text),
            ", now at %s", current_object);
- Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "UPDATE", 0);
+ Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "UPDATE", (flag&64));
  return(1);
 }
 
@@ -4305,8 +4306,12 @@ cannot_address:;
    }
    if(!(flag&(1<<29))) {
      xorriso->pacifier_count+= r1;
-     Xorriso_pacifier_callback(xorriso, "content bytes read",
-                               xorriso->pacifier_count, 0, "", 0);
+     if(flag&(1<<31))
+       Xorriso_pacifier_callback(xorriso, "content bytes read",
+                                 xorriso->pacifier_count, 0, "", 0);
+     else
+       Xorriso_pacifier_callback(xorriso, "bytes", xorriso->pacifier_count, 0,
+                                 "", 1<<6);
    }
  }
  if(diffcount>0 || r1count!=r2count) {
@@ -4623,7 +4628,8 @@ int Xorriso_find_compare(struct XorrisO *xorriso, void *boss_iter,
  follow_links= (xorriso->do_follow_links ||
                (xorriso->do_follow_param && !(flag&2))) <<28;
  ret= Xorriso_compare_2_files(xorriso, disk_path, iso_path, adrc, &result,
-    2 | follow_links | ((!(flag&2))<<27) | ((!(flag&1))<<29) | ((flag&1)<<31));
+                        2 | follow_links | ((!(flag&2))<<27) | ((flag&1)<<31));
+                                            /* was once: | ((!(flag&1))<<29) */
  if(ret<xorriso->find_compare_result)
    xorriso->find_compare_result= ret;
  if(flag&1) {
@@ -5297,6 +5303,7 @@ int Xorriso_process_errfile(struct XorrisO *xorriso,
        2="libburn"
        3="libisoburn"
        else: ""
+     bit6= append carriage return rather than line feed (if not os_errno)
 */
 int Xorriso_msgs_submit(struct XorrisO *xorriso, 
                         int error_code, char msg_text[], int os_errno,
@@ -5343,7 +5350,10 @@ int Xorriso_msgs_submit(struct XorrisO *xorriso,
    strcpy(xorriso->info_text, prefix);
    strncpy(xorriso->info_text+li, msg_text, lt);
  }
- xorriso->info_text[li+lt]= '\n';
+ if((flag&64) && os_errno<=0)
+   xorriso->info_text[li+lt]= '\r';
+ else
+   xorriso->info_text[li+lt]= '\n';
  xorriso->info_text[li+lt+1]= 0;
  Xorriso_info(xorriso,4|(flag&3));
  if(os_errno>0) {
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index d9ad23ca..b2144d1a 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.05.14.174846"
+#define Xorriso_timestamP "2008.05.15.092028"