From 7f002928d2f1378e5db2ab0c91da4421f7d8ed0c Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Wed, 17 Oct 2007 15:01:49 +0000
Subject: [PATCH] Reinstated the distinction of message sources, respected # in
 dialog

---
 test/xorriso.c           | 24 ++++++++++++++++++++----
 test/xorriso_timestamp.h |  2 +-
 test/xorrisoburn.c       |  2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/test/xorriso.c b/test/xorriso.c
index 1f92cdbb..136ea6c8 100644
--- a/test/xorriso.c
+++ b/test/xorriso.c
@@ -2963,6 +2963,12 @@ int Xorriso_set_problem_status(struct XorrisO *xorriso, char *severity,
 /* flag: 
      bit0= for Xorriso_info() : use pager (as with result)
      bit1= for Xorriso_info() : permission to suppress output
+     bit2..5= name prefix
+       0="xorriso"
+       1="libisofs"
+       2="libburn"
+       3="libisoburn"
+       else: ""
 */
 int Xorriso_msgs_submit(struct XorrisO *xorriso, 
                         int error_code, char msg_text[], int os_errno,
@@ -2970,6 +2976,9 @@ int Xorriso_msgs_submit(struct XorrisO *xorriso,
 {
  int ret, lt, li, sev, i;
  char *sev_text= "FATAL", prefix[80];
+ static char pfx_list[20][16]= {
+                   "xorriso : ", "libisofs: ", "libburn : ", "libisoburn: ",
+                    "", "", "", "", "", "", "", "", "", "", "", "" };
 
  /* Set problem status */
  ret= Xorriso__text_to_sev(severity, &sev, 0);
@@ -2986,7 +2995,7 @@ int Xorriso_msgs_submit(struct XorrisO *xorriso,
 
  /* >>> need option with threshhold for message reporting */
 
- sprintf(prefix,"xorriso : %s : ", sev_text);
+ sprintf(prefix,"%s%s : ", pfx_list[(flag>>2)&15], sev_text);
  li= strlen(prefix);
  lt= strlen(msg_text);
  if(lt>sizeof(xorriso->info_text)-li-2)
@@ -3004,8 +3013,8 @@ int Xorriso_msgs_submit(struct XorrisO *xorriso,
  xorriso->info_text[li+lt+1]= 0;
  Xorriso_info(xorriso,flag&3);
  if(os_errno>0) {
-   sprintf(xorriso->info_text, "xorriso : system: %s  (%d)\n", 
-           strerror(os_errno), os_errno);
+   sprintf(xorriso->info_text, "%ssys   : %s\n",
+           pfx_list[(flag>>2)&15], strerror(os_errno));
    Xorriso_info(xorriso,flag&3);
  }
  return(1);   
@@ -4388,7 +4397,10 @@ next_command:;
  xorriso->prepended_wd= 0;
  xorriso->request_to_abort= 0;
  Xorriso_set_problem_status(xorriso, "", 0);
- cmd= argv[*idx];
+ if((*idx)<argc)
+   cmd= argv[*idx];
+ else
+   cmd= "";
  (*idx)++;
 
  if((*idx)<argc)
@@ -4726,6 +4738,10 @@ int Xorriso_execute_option(struct XorrisO *xorriso, char *line, int flag)
  ret= Sfile_make_argv(xorriso->progname, line, &argc, &argv, 4);
  if(ret<=0)
    goto ex;
+ if(argc<2)
+   {ret= 1; goto ex;}
+ if(argv[1][0]=='#')
+   {ret= 1; goto ex;}
 
  ret= Xorriso_interpreter(xorriso, argc, argv, &idx, flag&0xffff);
  if(ret<0)
diff --git a/test/xorriso_timestamp.h b/test/xorriso_timestamp.h
index 6665d180..1fff9331 100644
--- a/test/xorriso_timestamp.h
+++ b/test/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2007.10.17.130311"
+#define Xorriso_timestamP "2007.10.17.150142"
diff --git a/test/xorrisoburn.c b/test/xorrisoburn.c
index bf3d5411..335865e1 100644
--- a/test/xorrisoburn.c
+++ b/test/xorrisoburn.c
@@ -488,7 +488,7 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag)
      if(ret<=0)
    break;
      Xorriso_msgs_submit(xorriso, error_code, xorriso->info_text, os_errno, 
-                         severity, 0);
+                         severity, (pass+1)<<2);
      count++;
    }
  }