r1732 - in trunk/user

stsp at dslinux.in-berlin.de stsp at dslinux.in-berlin.de
Sun Apr 15 22:59:23 CEST 2007


Author: stsp
Date: 2007-04-15 22:59:18 +0200 (Sun, 15 Apr 2007)
New Revision: 1732

Log:
New port of Midnight Commander by GPF and myself.
Uses configure script this time.


Added: trunk/user/mc/Makefile

Copied: trunk/user/mc/src (from rev 1731, tags/mc/mc-4.1.40-pre9/user/mc)

Modified: trunk/user/mc/src/edit/editcmd.c
===================================================================
--- tags/mc/mc-4.1.40-pre9/user/mc/edit/editcmd.c	2007-04-15 20:39:40 UTC (rev 1731)
+++ trunk/user/mc/src/edit/editcmd.c	2007-04-15 20:59:18 UTC (rev 1732)
@@ -29,6 +29,7 @@
 #endif
 #include <fcntl.h>
 #include <ctype.h>
+#include <stddef.h>
 #include "edit.h"
 #include "editcmddef.h"
 #include "edit-widget.h"

Modified: trunk/user/mc/src/src/background.c
===================================================================
--- tags/mc/mc-4.1.40-pre9/user/mc/src/background.c	2007-04-15 20:39:40 UTC (rev 1731)
+++ trunk/user/mc/src/src/background.c	2007-04-15 20:59:18 UTC (rev 1732)
@@ -144,7 +144,7 @@
 #endif /*__BEOS__*/
 	return -1;
     
-    if ((pid = fork ()) == -1)
+    if ((pid = vfork ()) == -1)
 	return -1;
     
     if (pid == 0) {

Modified: trunk/user/mc/src/src/cons.handler.c
===================================================================
--- tags/mc/mc-4.1.40-pre9/user/mc/src/cons.handler.c	2007-04-15 20:39:40 UTC (rev 1731)
+++ trunk/user/mc/src/src/cons.handler.c	2007-04-15 20:59:18 UTC (rev 1732)
@@ -124,7 +124,7 @@
 	pipe (pipefd1);
 	pipe (pipefd2);
 	/* Get the console saver running */
-	cons_saver_pid = fork ();
+	cons_saver_pid = vfork ();
 	if (cons_saver_pid < 0) {
 	    /* Can't fork */
 	    /* Delete pipes */
@@ -204,6 +204,7 @@
 	}
 	break;
     default:
+	break;
 	/* Nothing */
     }
 }

Modified: trunk/user/mc/src/src/file.c
===================================================================
--- tags/mc/mc-4.1.40-pre9/user/mc/src/file.c	2007-04-15 20:39:40 UTC (rev 1731)
+++ trunk/user/mc/src/src/file.c	2007-04-15 20:59:18 UTC (rev 1732)
@@ -117,6 +117,7 @@
 #endif
 
 int do_reget;
+int copy_local;
 
 /* rcsid [] = "$Id: file.c,v 1.17 1998/05/24 01:29:37 norbert Exp $" */
 int verbose = 1;

Modified: trunk/user/mc/src/src/file.h
===================================================================
--- tags/mc/mc-4.1.40-pre9/user/mc/src/file.h	2007-04-15 20:39:40 UTC (rev 1731)
+++ trunk/user/mc/src/src/file.h	2007-04-15 20:59:18 UTC (rev 1732)
@@ -26,7 +26,7 @@
 
 extern int dive_into_subdirs;
 
-int copy_local;
+extern int copy_local;
 
 /* Error reporting routines */
     /* Skip/Retry/Abort routine */

Modified: trunk/user/mc/src/src/subshell.c
===================================================================
--- tags/mc/mc-4.1.40-pre9/user/mc/src/subshell.c	2007-04-15 20:39:40 UTC (rev 1731)
+++ trunk/user/mc/src/src/subshell.c	2007-04-15 20:59:18 UTC (rev 1732)
@@ -359,7 +359,7 @@
 
     subshell_alive = TRUE;
     subshell_stopped = FALSE;
-    subshell_pid = fork ();
+    subshell_pid = vfork ();
     
     if (subshell_pid == -1)
     {

Modified: trunk/user/mc/src/src/utilunix.c
===================================================================
--- tags/mc/mc-4.1.40-pre9/user/mc/src/utilunix.c	2007-04-15 20:39:40 UTC (rev 1731)
+++ trunk/user/mc/src/src/utilunix.c	2007-04-15 20:59:18 UTC (rev 1732)
@@ -273,8 +273,8 @@
     /* handler messing the screen after the SIGCONT */
     sigaction (SIGTSTP, &startup_handler, &save_stop);
 
-    if ((pid = fork ()) < 0) {
-	fprintf (stderr, "\n\nfork () = -1\n");
+    if ((pid = vfork ()) < 0) {
+	fprintf (stderr, "\n\nvfork () = -1\n");
 	return -1;
     }
     if (pid == 0) {
@@ -476,7 +476,7 @@
     sigaction (SIGQUIT, &ignore, &save_quit);
     sigaction (SIGTSTP, &startup_handler, &save_stop);
 
-    switch (pid = fork ()) {
+    switch (pid = vfork ()) {
     case -1:
             closepipes ();
 	    return -1;
@@ -484,7 +484,7 @@
 	    sigaction (SIGINT, &save_intr, NULL);
 	    sigaction (SIGQUIT, &save_quit, NULL);
 
-	    switch (pid = fork ()) {
+	    switch (pid = vfork ()) {
 	    	case -1:
 	    	    closepipes ();
 	    	    exit (1);

Modified: trunk/user/mc/src/src/view.c
===================================================================
--- tags/mc/mc-4.1.40-pre9/user/mc/src/view.c	2007-04-15 20:39:40 UTC (rev 1731)
+++ trunk/user/mc/src/src/view.c	2007-04-15 20:59:18 UTC (rev 1732)
@@ -639,12 +639,14 @@
 		if (view->data != (unsigned char*)0)
 			free(view->data);
 		close_view_file (view);
+#if 0
 #ifndef __BEOS__
 	if (intr_flag) {
 	    view->partial = 1;
 	    view->s.st_size = 0;
 	}
 #endif /*__BEOS__*/
+#endif
 		return init_growing_view (view, 0, filename);
     }
     view->first = 0;

Modified: trunk/user/mc/src/vfs/mcserv.c
===================================================================
--- tags/mc/mc-4.1.40-pre9/user/mc/vfs/mcserv.c	2007-04-15 20:39:40 UTC (rev 1731)
+++ trunk/user/mc/src/vfs/mcserv.c	2007-04-15 20:59:18 UTC (rev 1732)
@@ -1135,7 +1135,7 @@
 	newsocket = accept (sock, (struct sockaddr *) &client_address,
 			    &clilen);
 
-	if (isDaemon && (child = fork())) {
+	if (isDaemon && (child = vfork())) {
 	    int status;
 	    
 	    close (newsocket);
@@ -1143,7 +1143,7 @@
 	    continue;
 	}
 
-	if (isDaemon && fork()) exit (0);
+	if (isDaemon && vfork()) exit (0);
 
 	server (newsocket);
 	close (newsocket);
@@ -1263,7 +1263,7 @@
 	}
     }
 
-    if (isDaemon && fork()) exit (0);
+    if (isDaemon && vfork()) exit (0);
 
     if (portnum == 0)
 	portnum = get_port_number ();




More information about the dslinux-commit mailing list