Author: jsuchome Date: Wed Oct 1 11:57:57 2008 New Revision: 51722 URL: http://svn.opensuse.org/viewcvs/yast?rev=51722&view=rev Log: - call _exit() to exit the child process, not exit() (bnc#430229) - reduced some debugging code Modified: trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Modified: trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-fprint/s... ============================================================================== --- trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc (original) +++ trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc Wed Oct 1 11:57:57 2008 @@ -44,20 +44,18 @@ void FPrintAPI::catch_sigterm (int sig_num) { instance().finalize (); - exit (256); + _exit (256); } // de-initialize finger print reader (must be called at the end!) void FPrintAPI::finalize () { - y2internal ("finalize"); if (instance().data != NULL) { fp_print_data_free (instance().data); instance().data = NULL; } fp_exit(); - y2internal ("finalized"); } FPrintAPI::FPrintAPI() @@ -133,20 +131,18 @@ do { sleep (1); - y2internal ("Scan your finger now."); - - // FIXME not possible, this is total number of stages - y2milestone ("remaining stages: %d", fp_dev_get_nr_enroll_stages(dev)); r = fp_enroll_finger (dev, &enrolled_print); + y2debug ("retval: %d", r); + if (r < 0) { y2error ("Enroll failed with error %d", r); instance().finalize (); signal (15, SIG_DFL); return r; } -y2internal ("retval: %d", r); + if (write (write_fd, &r, sizeof (int)) == -1) y2error ("write to pipe failed: %d (%m)", errno); @@ -411,7 +407,7 @@ FPrintAPI::instance().acquire (data_pipe[1], path); y2milestone ("acquire done with state %d", state); close (data_pipe[1]); - exit (state); + _exit (state); } else // parent -> return { Modified: trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/package/yast2-... ============================================================================== --- trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes (original) +++ trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Wed Oct 1 11:57:57 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 1 11:53:49 CEST 2008 - jsuchome@suse.cz + +- call _exit() to exit the child process, not exit() (bnc#430229) + +------------------------------------------------------------------- Mon Sep 29 15:51:23 CEST 2008 - jsuchome@suse.cz - check the values returned by agent (fp_enroll_finger_img) in YCP -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org