terminal-session: rename "session_done" to "session_hangup"

In truth, we can get hangups at any time during boot.  It doesn't
mean the session is done, so use better terminology.

diff --git a/src/libply/ply-terminal-session.c b/src/libply/ply-terminal-session.c
index 68f487fd07812f53ad2a9c6bef4bef8d99a3943f..c5f37e147264fe9e8d6e70ba3e5ccf7223e81fbd 100644 (file)
--- a/src/libply/ply-terminal-session.c
+++ b/src/libply/ply-terminal-session.c
@@ -50,7 +50,7 @@ struct _ply_terminal_session
   ply_fd_watch_t   *fd_watch;
 
   ply_terminal_session_output_handler_t output_handler;
-  ply_terminal_session_done_handler_t   done_handler;
+  ply_terminal_session_hangup_handler_t hangup_handler;
   void                                 *user_data;
 
   uint32_t is_running : 1;
@@ -266,7 +266,7 @@ ply_terminal_session_run (ply_terminal_session_t              *session,
                           ply_terminal_session_flags_t         flags,
                           ply_terminal_session_begin_handler_t begin_handler,
                           ply_terminal_session_output_handler_t output_handler,
-                          ply_terminal_session_done_handler_t  done_handler,
+                          ply_terminal_session_hangup_handler_t hangup_handler,
                           void                                *user_data)
 {
   pid_t pid;
@@ -275,7 +275,7 @@ ply_terminal_session_run (ply_terminal_session_t              *session,
   assert (session != NULL);
   assert (session->loop != NULL);
   assert (!session->is_running);
-  assert (session->done_handler == NULL);
+  assert (session->hangup_handler == NULL);
 
   run_in_parent = (flags & PLY_TERMINAL_SESSION_FLAGS_RUN_IN_PARENT) != 0;
   look_in_path = (flags & PLY_TERMINAL_SESSION_FLAGS_LOOK_IN_PATH) != 0;
@@ -317,7 +317,7 @@ ply_terminal_session_run (ply_terminal_session_t              *session,
     {
       session->is_running = true;
       session->output_handler = output_handler;
-      session->done_handler = done_handler;
+      session->hangup_handler = hangup_handler;
       session->user_data = user_data;
       ply_terminal_session_start_logging (session);
 
@@ -342,7 +342,7 @@ bool
 ply_terminal_session_attach (ply_terminal_session_t               *session,
                              ply_terminal_session_flags_t          flags,
                              ply_terminal_session_output_handler_t output_handler,
-                             ply_terminal_session_done_handler_t   done_handler,
+                             ply_terminal_session_hangup_handler_t   hangup_handler,
                              int                                   ptmx,
                              void                                 *user_data)
 {
@@ -351,7 +351,7 @@ ply_terminal_session_attach (ply_terminal_session_t               *session,
   assert (session != NULL);
   assert (session->loop != NULL);
   assert (!session->is_running);
-  assert (session->done_handler == NULL);
+  assert (session->hangup_handler == NULL);
 
   should_redirect_console = 
     (flags & PLY_TERMINAL_SESSION_FLAGS_REDIRECT_CONSOLE) != 0;
@@ -388,7 +388,7 @@ ply_terminal_session_attach (ply_terminal_session_t               *session,
 
   session->is_running = true;
   session->output_handler = output_handler;
-  session->done_handler = done_handler;
+  session->hangup_handler = hangup_handler;
   session->user_data = user_data;
   ply_terminal_session_start_logging (session);
 
@@ -418,7 +418,7 @@ ply_terminal_session_detach (ply_terminal_session_t       *session)
     }
 
   session->output_handler = NULL;
-  session->done_handler = NULL;
+  session->hangup_handler = NULL;
   session->user_data = NULL;
 
   session->is_running = false;
@@ -470,20 +470,20 @@ ply_terminal_session_on_new_data (ply_terminal_session_t *session,
 static void
 ply_terminal_session_on_hangup (ply_terminal_session_t *session)
 {
-  ply_terminal_session_done_handler_t done_handler;
+  ply_terminal_session_hangup_handler_t hangup_handler;
 
   assert (session != NULL);
 
-  done_handler = session->done_handler;
+  hangup_handler = session->hangup_handler;
 
   ply_logger_flush (session->logger);
 
   session->is_running = false;
   ply_terminal_session_stop_logging (session);
-  session->done_handler = NULL;
+  session->hangup_handler = NULL;
 
-  if (done_handler != NULL)
-    done_handler (session->user_data, session);
+  if (hangup_handler != NULL)
+    hangup_handler (session->user_data, session);
 
   ply_terminal_session_detach (session);
 }
@@ -594,7 +594,7 @@ main (int    argc,
   if (!ply_terminal_session_run (session, flags, 
                                  (ply_terminal_session_begin_handler_t) NULL,
                                  (ply_terminal_session_output_handler_t) NULL,
-                                 (ply_terminal_session_done_handler_t) 
+                                 (ply_terminal_session_hangup_handler_t) 
                                  on_finished, loop))
     {
       perror ("could not start terminal session");

diff --git a/src/libply/ply-terminal-session.h b/src/libply/ply-terminal-session.h
index eb858a7167004f681adee1fc08d05eee25fa5804..7fee891bfc283b48bd82215786cd41aba41ce5eb 100644 (file)
--- a/src/libply/ply-terminal-session.h
+++ b/src/libply/ply-terminal-session.h
@@ -36,7 +36,7 @@ typedef void (* ply_terminal_session_begin_handler_t)
 
 typedef void (* ply_terminal_session_output_handler_t)
     (void *user_data, const uint8_t *output, size_t size, ply_terminal_session_t *session);
-typedef void (* ply_terminal_session_done_handler_t) 
+typedef void (* ply_terminal_session_hangup_handler_t) 
     (void *user_data, ply_terminal_session_t *session);
 
 typedef enum
@@ -56,13 +56,13 @@ bool ply_terminal_session_run (ply_terminal_session_t       *session,
                                ply_terminal_session_flags_t  flags,
                                ply_terminal_session_begin_handler_t begin_handler,
                                ply_terminal_session_output_handler_t output_handler,
-                               ply_terminal_session_done_handler_t  done_handler,
+                               ply_terminal_session_hangup_handler_t  done_handler,
                                void                                *user_data);
 
 bool ply_terminal_session_attach (ply_terminal_session_t       *session,
                                   ply_terminal_session_flags_t  flags,
                                   ply_terminal_session_output_handler_t output_handler,
-                                  ply_terminal_session_done_handler_t  done_handler,
+                                  ply_terminal_session_hangup_handler_t hangup_handler,
                                   int                                  ptmx,
                                   void                                *user_data);
 

diff --git a/src/main.c b/src/main.c
index 4b069c75139d8b2f94564024fa49b906a95a0e96..2787aedbf0968526a55142a56dc2bf533856994b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -159,7 +159,7 @@ on_session_output (state_t    *state,
 }
 
 static void
-on_session_finished (state_t *state)
+on_session_hangup (state_t *state)
 {
   ply_trace ("got hang up on terminal session fd");
 }
@@ -1607,8 +1607,8 @@ attach_to_running_session (state_t *state)
   if (!ply_terminal_session_attach (session, flags,
                                  (ply_terminal_session_output_handler_t)
                                  on_session_output,
-                                 (ply_terminal_session_done_handler_t)
-                                 (should_be_redirected? on_session_finished: NULL),
+                                 (ply_terminal_session_hangup_handler_t)
+                                 (should_be_redirected? on_session_hangup: NULL),
                                  -1, state))
     {
       ply_save_errno ();