[MPlayer-dev-eng] [PATCH] exit -> exit_player

[Joey Parrish]

Hello,

This is a patch to call exit_player instead of exit.  I sent a patch for
this before, and this differs in that it doesn't touch the signal
handler.  This version is more conservative, and IMHO safe.

Any objections?  OK to commit?

--Joey

-- 
"The greatest thing you'll ever learn
is just to love and be loved in return." -- Darth Vader
-------------- next part --------------
make sure exit_player gets called

diff -ur main.sofar/mplayer.c main.dev/mplayer.c
--- main.sofar/mplayer.c	2004-09-19 06:21:33.000000000 -0100
+++ main.dev/mplayer.c	2004-09-22 01:17:50.698940800 -0100
@@ -557,7 +557,7 @@
 char *conffile;
 int conffile_fd;
 if (m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mplayer.conf") < 0)
-  exit(1);
+  exit_player(NULL);
 if ((conffile = get_path("")) == NULL) {
   mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir);
 } else {
@@ -576,7 +576,7 @@
       close(conffile_fd);
     }
     if (m_config_parse_config_file(conf, conffile) < 0)
-      exit(1);
+      exit_player(NULL);
     free(conffile);
   }
 }
@@ -874,7 +874,7 @@
 
     playtree = m_config_parse_mp_command_line(mconfig, argc, argv);
     if(playtree == NULL)
-      exit(1);
+      exit_player(NULL);
 
     playtree = play_tree_cleanup(playtree);
     if(playtree) {
@@ -917,12 +917,12 @@
 
     if(video_driver_list && strcmp(video_driver_list[0],"help")==0){
       list_video_out();
-      exit(0);
+      exit_player_with_rc(NULL, 0);
     }
 
     if(audio_driver_list && strcmp(audio_driver_list[0],"help")==0){
       list_audio_out();
-      exit(0);
+      exit_player_with_rc(NULL, 0);
     }
 
 // check codec.conf
@@ -931,7 +931,7 @@
     if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){
       if(!parse_codec_cfg(NULL)){
 	mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
-	exit(0);
+        exit_player_with_rc(NULL, 0);
       }
       mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_BuiltinCodecsConf);
     }
@@ -951,34 +951,34 @@
       mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs);
       list_codecs(1);
       printf("\n");
-      exit(0);
+      exit_player_with_rc(NULL, 0);
     }
     if(video_codec_list && strcmp(video_codec_list[0],"help")==0){
       mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs);
       list_codecs(0);
       printf("\n");
-      exit(0);
+      exit_player_with_rc(NULL, 0);
     }
     if(video_fm_list && strcmp(video_fm_list[0],"help")==0){
       vfm_help();
       printf("\n");
-      exit(0);
+      exit_player_with_rc(NULL, 0);
     }
     if(audio_fm_list && strcmp(audio_fm_list[0],"help")==0){
       afm_help();
       printf("\n");
-      exit(0);
+      exit_player_with_rc(NULL, 0);
     }
     if(af_cfg.list && strcmp(af_cfg.list[0],"help")==0){
       af_help();
       printf("\n");
-      exit(0);
+      exit_player_with_rc(NULL, 0);
     }
 #ifdef HAVE_X11
     if(vo_fstype_list && strcmp(vo_fstype_list[0],"help")==0){
       fstype_help();
       printf("\n");
-      exit(0);
+      exit_player_with_rc(NULL, 0);
     }
 #endif
 
@@ -1028,7 +1028,7 @@
       if(!use_gui){
 	// no file/vcd/dvd -> show HELP:
 	mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text);
-	exit(0);
+        exit_player_with_rc(NULL, 0);
       } else gui_no_filename=1;
     }