X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vsyssh%2Fvsyssh.c;h=0239fec948548d780807119f1d4c78b5d7c0234e;hb=26326ab885a36f7e0661703b735109df36520b30;hp=7ae4deb8cf8340f97c82c945f7a60b858c561b27;hpb=a00da83ae83f5f8b6927519a1b6840bcfd4256f6;p=vsys.git

diff --git a/vsyssh/vsyssh.c b/vsyssh/vsyssh.c
index 7ae4deb..0239fec 100644
--- a/vsyssh/vsyssh.c
+++ b/vsyssh/vsyssh.c
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -22,47 +23,61 @@
 #include <stdarg.h>
 #include <dirent.h>
 
+void pipe_handler (int sig) {
+	printf("SIGPIPE");
+}
+
 int main(int argc, char **argv, char **envp)
 {
 	if (argc<2) {
-		printf("Usage: vsyssh <vsys entry> <cmd>\n");
+		printf("Usage: vsyssh <vsys entry> [cmd]\n");
 		exit(1);
 	}
 	else {
 		int vfd0,vfd1;
 		char *inf,*outf;
+		struct timeval tv;
+
+		signal(SIGPIPE,pipe_handler);
 		inf=(char *)malloc(strlen(argv[1])+3);
-		outf=(char *)malloc(strlen(argv[2])+4);
+		outf=(char *)malloc(strlen(argv[1])+4);
 		strcpy(inf,argv[1]);
-		strcpy(inf,argv[2]);
+		strcpy(outf,argv[1]);
 		strcat(inf,".in");
 		strcat(outf,".out");
 
+		vfd0 = open(outf,O_RDONLY|O_NONBLOCK);
+		printf("Out file: %d\n",vfd0);
 		vfd1 = open(inf,O_WRONLY);
-		vfd0 = open(outf,O_RDONLY);
+		printf("In file: %d\n",vfd1);
 
 		if (vfd0==-1 || vfd1 == -1) {
-			printf("Error opening vsys entry %s\n", argv[1]);
+			printf("Error opening vsys entry %s (%s)\n", argv[1],strerror(errno));
 			exit(1);
 		}
 
-		
 		if (argc<3) {
 			fd_set set;
 			FD_ZERO(&set);
-			FD_SET(0,&set);
-			FD_SET(vfd0,&set);
-			while (1) {
+			FD_SET(0, &set);
+			FD_SET(vfd0, &set);
+
+			while (1)
+			 {
 				int ret;
-				ret = select(2, &set, NULL, NULL, NULL);
+				printf("vsys>");fflush(stdout);
+				FD_SET(0, &set);
+				FD_SET(vfd0, &set);
+				ret = select(vfd0+1, &set, NULL, NULL, NULL);
 				if (FD_ISSET(0,&set)) {
 					char lineread[2048];
 					int ret;
 					ret=read(0,lineread,2048);
+					lineread[ret]='\0';
+					printf ("writing %s\n",lineread);
 					write(vfd1,lineread,ret);
 					FD_CLR(0,&set);
-				}
-				else if (FD_ISSET(vfd0,&set)) {
+				} if (FD_ISSET(vfd0,&set)) {
 					char lineread[2048];
 					int ret;
 					ret=read(vfd0,lineread,2048);