[Cvs-cvs] ccvs/src ChangeLog main.c release.c server.c [cvs1-11-x-branch]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Derek Robert Price <address@hidden>     06/02/02 13:08:36

Modified files:
        src            : ChangeLog main.c release.c server.c 

Log message:
        * main.c (main), release.c (release), server.c (do_cvs_command): Always
        call the cleanup hooks before exit.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.2336.2.418&tr2=1.2336.2.419&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/main.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.172.4.16&tr2=1.172.4.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/release.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.48.6.9&tr2=1.48.6.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/server.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.284.2.42&tr2=1.284.2.43&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.418 ccvs/src/ChangeLog:1.2336.2.419
--- ccvs/src/ChangeLog:1.2336.2.418     Wed Feb  1 21:27:02 2006
+++ ccvs/src/ChangeLog  Thu Feb  2 13:08:36 2006
@@ -1,3 +1,8 @@
+2006-02-02  Derek Price  <address@hidden>
+
+       * main.c (main), release.c (release), server.c (do_cvs_command): Always
+       call the cleanup hooks before exit.
+
 2006-02-01  Derek Price  <address@hidden>
 
        * tag.c (add_to_val_tags): When a tag turns out to exist in the db when
Index: ccvs/src/main.c
diff -u ccvs/src/main.c:1.172.4.16 ccvs/src/main.c:1.172.4.17
--- ccvs/src/main.c:1.172.4.16  Fri Sep  2 19:37:34 2005
+++ ccvs/src/main.c     Thu Feb  2 13:08:36 2006
@@ -545,6 +545,12 @@
 
                (void) fputs ("Specify the --help option for further 
information about CVS\n", stdout);
 
+#ifdef SYSTEM_CLEANUP
+               /* Hook for OS-specific behavior, for example socket subsystems
+                * on NT and OS2 or dealing with windows and arguments on Mac.
+                */
+               SYSTEM_CLEANUP ();
+#endif
                exit (0);
                break;
            case 'b':
Index: ccvs/src/release.c
diff -u ccvs/src/release.c:1.48.6.9 ccvs/src/release.c:1.48.6.10
--- ccvs/src/release.c:1.48.6.9 Fri Sep  2 19:41:05 2005
+++ ccvs/src/release.c  Thu Feb  2 13:08:36 2006
@@ -251,7 +251,7 @@
            through release-23. */
 
        if (restore_cwd (&cwd, NULL))
-           exit (EXIT_FAILURE);
+           error_exit ();
 
        if (1
 #ifdef CLIENT_SUPPORT
@@ -268,7 +268,7 @@
            argv[2] = NULL;
            err += unedit (argc, argv);
             if (restore_cwd (&cwd, NULL))
-                exit (EXIT_FAILURE);
+                error_exit ();
        }
 
 #ifdef CLIENT_SUPPORT
@@ -306,7 +306,7 @@
             err += get_server_responses ();
 
             if (restore_cwd (&cwd, NULL))
-                exit (EXIT_FAILURE);
+                error_exit ();
         }
 #endif /* CLIENT_SUPPORT */
     }
Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.284.2.42 ccvs/src/server.c:1.284.2.43
--- ccvs/src/server.c:1.284.2.42        Mon Jan 30 23:32:23 2006
+++ ccvs/src/server.c   Thu Feb  2 13:08:36 2006
@@ -2961,6 +2961,17 @@
         */
 #endif
 
+       rcs_cleanup ();
+       Lock_Cleanup ();
+#ifdef SERVER_SUPPORT
+       if (server_active)
+           server_cleanup (0);
+#endif
+#ifdef SYSTEM_CLEANUP
+       /* Hook for OS-specific behavior, for example socket subsystems on
+          NT and OS2 or dealing with windows and arguments on Mac.  */
+       SYSTEM_CLEANUP ();
+#endif
        exit (exitstatus);
     }
 
@@ -5936,6 +5947,8 @@
        printf ("I LOVE YOU\n");
        fflush (stdout);
 
+       /* It's okay to skip rcs_cleanup() and Lock_Cleanup() here.  */
+
 #ifdef SYSTEM_CLEANUP
        /* Hook for OS-specific behavior, for example socket subsystems on
           NT and OS2 or dealing with windows and arguments on Mac.  */