Changeset 3103

Timestamp:

03/05/10 03:12:44 (6 months ago)

Author:

scdbackup

Message:

Enabled optional use of new signal action 2 with libburn built-in handler

Location:

libburn/trunk/cdrskin

Files:

• cdrskin.c (modified) (23 diffs)
• cdrskin_timestamp.h (modified) (1 diff)

libburn/trunk/cdrskin/cdrskin.c

@@ -149 +149 @@
 */
 
-/* Do not stay in signal handler but only cancel and set Cdrskin_abort_leveL
+/* Do not stay in signal handler but only cancel and set Cdrskin_abort_leveL.
+   Make use of burn_is_aborting() to detect pending libburn aborts.
 */
 #define Cdrskin_signal_handler_return_2 1
@@ -373 +374 @@
 #else
 #include "cleanup.h"
+#ifdef Cdrskin_use_libburn_cleanuP
+#undef Cdrskin_use_libburn_cleanuP
+#endif
 #endif
 
@@ -388 +392 @@
 #define Cleanup_handler_funC   NULL
 #define Cleanup_handler_handlE "cdrskin: "
+#define Cleanup_handler_flaG 48
 #else
 #define Cleanup_handler_funC   (Cleanup_app_handler_T) Cdrskin_abort_handler
 #define Cleanup_handler_handlE skin
+#define Cleanup_handler_flaG 4
 #endif /* ! Cdrskin_use_libburn_cleanuP */
 
@@ -4114 +4120 @@
  if(restore_handler) {
    int Cdrskin_abort_handler(struct CdrskiN *, int, int);
-   Cleanup_set_handlers(Cleanup_handler_handlE, Cleanup_handler_funC, 4);
+   Cleanup_set_handlers(Cleanup_handler_handlE, Cleanup_handler_funC,
+                        Cleanup_handler_flaG);
  }
 #endif /* Cdrskin_grab_abort_brokeN */
@@ -4144 +4151 @@
  skin->grabbed_drive= NULL;
  return(1);
+}
+
+
+int Cdrskin__is_aborting(int flag)
+{
+ if(Cdrskin_abort_leveL)
+   return(-1);
+#ifdef Cdrskin_signal_handler_return_2
+  return(burn_is_aborting(0));
+#else
+  return 0;
+#endif
 }
 
@@ -6095 +6114 @@
  if(skin->drive_is_grabbed)
    Cdrskin_release_drive(skin,0);
- if(Cdrskin_abort_leveL)
+ if(Cdrskin__is_aborting(0))
    Cdrskin_abort(skin, 0); /* Never comes back */
  return(ret);
@@ -6150 +6169 @@
  static double last_fifo_in= 0.0,last_fifo_out= 0.0,curr_fifo_in,curr_fifo_out;
 
- if(Cdrskin_abort_leveL)
+ if(Cdrskin__is_aborting(0))
    Cdrskin_abort(skin, 0); /* Never comes back */
 
@@ -7361 +7380 @@
  burn_disc_write(o, disc);
  if(skin->preskin->abort_handler==-1)
-   Cleanup_set_handlers(Cleanup_handler_handlE, Cleanup_handler_funC, 4);
+   Cleanup_set_handlers(Cleanup_handler_handlE, Cleanup_handler_funC,
+                        Cleanup_handler_flaG);
  last_time= start_time= Sfile_microtime(0);
 
@@ -7380 +7400 @@
    /* >>> how do i learn about success or failure ? */
 
-   if(loop_counter>0 || Cdrskin_abort_leveL)
+   if(loop_counter>0 || Cdrskin__is_aborting(0))
      Cdrskin_burn_pacifier(skin,drive_status,&p,start_time,&last_time,
                            &total_count,&last_count,&min_buffer_fill,0);
@@ -7454 +7474 @@
    printf("\n");
 
- if(Cdrskin_abort_leveL)
+ if(Cdrskin__is_aborting(0))
    Cdrskin_abort(skin, 0); /* Never comes back */
 
@@ -8955 +8975 @@
  if(skin->preskin->abort_handler==1 || skin->preskin->abort_handler==3 || 
     skin->preskin->abort_handler==4)
-   Cleanup_set_handlers(Cleanup_handler_handlE, Cleanup_handler_funC, 4);
+   Cleanup_set_handlers(Cleanup_handler_handlE, Cleanup_handler_funC,
+                        Cleanup_handler_flaG);
  else if(skin->preskin->abort_handler==2)
-   Cleanup_set_handlers(Cleanup_handler_handlE, Cleanup_handler_funC, 2|8);
+   Cleanup_set_handlers(Cleanup_handler_handlE, Cleanup_handler_funC,
+                        2 | 8);
 
  printf("cdrskin: scanning for devices ...\n");
@@ -9033 +9055 @@
    if(skin->n_drives<=0 && skin->preskin->scan_demands_drive)
      {*exit_value= 4; goto no_drive;}
-   if(Cdrskin_abort_leveL)
+   if(Cdrskin__is_aborting(0))
      goto ex;
    ret= Cdrskin_scanbus(skin,1);
@@ -9045 +9067 @@
    if(skin->n_drives<=0 && skin->preskin->scan_demands_drive)
      {*exit_value= 5; goto no_drive;}
-   if(Cdrskin_abort_leveL)
+   if(Cdrskin__is_aborting(0))
      goto ex;
    ret= Cdrskin_scanbus(skin,0);
@@ -9053 +9075 @@
  }
  if(skin->do_load) {
-   if(Cdrskin_abort_leveL)
+   if(Cdrskin__is_aborting(0))
      goto ex;
    ret= Cdrskin_grab_drive(skin,8);
@@ -9070 +9092 @@
  }
  if(skin->do_checkdrive) {
-   if(Cdrskin_abort_leveL)
+   if(Cdrskin__is_aborting(0))
      goto ex;
    ret= Cdrskin_checkdrive(skin,"",(skin->do_checkdrive==2)<<1);
@@ -9078 +9100 @@
    if(skin->n_drives<=0)
      {*exit_value= 12; goto no_drive;}
-   if(Cdrskin_abort_leveL)
+   if(Cdrskin__is_aborting(0))
      goto ex;
    ret= Cdrskin_msinfo(skin,0);
@@ -9087 +9109 @@
    if(skin->n_drives<=0)
      {*exit_value= 7; goto no_drive;}
-   if(Cdrskin_abort_leveL)
+   if(Cdrskin__is_aborting(0))
      goto ex;
    ret= Cdrskin_atip(skin, skin->do_atip == 4 ? 4 :
@@ -9097 +9119 @@
    if(skin->n_drives<=0)
      {*exit_value= 14; goto no_drive;}
-   if(Cdrskin_abort_leveL)
+   if(Cdrskin__is_aborting(0))
      goto ex;
    ret= Cdrskin_list_formats(skin, 0);
@@ -9106 +9128 @@
    if(skin->n_drives<=0)
      {*exit_value= 8; goto no_drive;}
-   if(Cdrskin_abort_leveL)
+   if(Cdrskin__is_aborting(0))
      goto ex;
    ret= Cdrskin_blank(skin,0);
@@ -9116 +9138 @@
  if(skin->do_direct_write) {
    skin->do_burn= 0;
-   if(Cdrskin_abort_leveL)
+   if(Cdrskin__is_aborting(0))
      goto ex;
    ret= Cdrskin_direct_write(skin,0);
@@ -9127 +9149 @@
    if(skin->n_drives<=0)
      {*exit_value= 10; goto no_drive;}
-   if(Cdrskin_abort_leveL)
+   if(Cdrskin__is_aborting(0))
      goto ex;
    ret= Cdrskin_burn(skin,0);
@@ -9134 +9156 @@
  }
 ex:;
- if(Cdrskin_abort_leveL)
+ if(Cdrskin__is_aborting(0))
    Cdrskin_abort(skin, 0); /* Never comes back */
  return((*exit_value)==0);
@@ -9223 +9245 @@
  }
 
- if(!Cdrskin_abort_leveL)
+ if(!Cdrskin__is_aborting(0))
    Cdrskin_run(skin,&exit_value,0);
 
 ex:;
- if(Cdrskin_abort_leveL)
+ if(Cdrskin__is_aborting(0))
    Cdrskin_abort(skin, 0); /* Never comes back */
 

libburn/trunk/cdrskin/cdrskin_timestamp.h

@@ -1 @@
-#define Cdrskin_timestamP "2010.03.05.090948"
+#define Cdrskin_timestamP "2010.03.05.091432"