Commit: 42df141c8934e1a50de185a22592ee4cf5f7bc7a - cygterm (hg)

Commit MetaInfo

• Revision: 42df141c8934e1a50de185a22592ee4cf5f7bc7a (tree)
• Zeit: 2013-12-27 17:37:16
• Autor: zolgear <>
• Commiter: zolgear <>

Log Message

cyglaunch が 64bit Cygwin を検出した場合， cygterm64.exe を優先的に起動するようにした。
cyglaunch を立ち上げた時，カレントディレクトリから cygterm が起動するようにした。
cygwin 上から cyglaunch が起動できないのを修正

Ändern Zusammenfassung

• modified: Makefile
• modified: README
• modified: README-j
• modified: cyglaunch.c

Diff

diff -r d3fd0dd5980f -r 42df141c8934 Makefile
--- a/Makefile	Fri Dec 27 17:34:32 2013 +0900
+++ b/Makefile	Fri Dec 27 17:37:16 2013 +0900
@@ -1,6 +1,7 @@
 # Makefile for CygTerm
 
 BINDIR = $(HOME)/bin
+ARCH = $(shell arch)
 
 CC = gcc
 CFLAGS = -O2 -fno-exceptions
@@ -10,6 +11,11 @@
 LAUNCH = cyglaunch.exe
 LAUNCH_SRC = cyglaunch.c
 EXE = cygterm.exe
+ifeq ($(ARCH),x86_64)
+OUT = $(EXE:.exe=64.exe)
+else
+OUT = $(EXE:.exe=.exe)
+endif
 SRC = $(EXE:.exe=.cc)
 CFG = $(EXE:.exe=.cfg)
 RES = $(EXE:.exe=.res)
@@ -23,11 +29,11 @@
 
 $(EXE) : $(SRC) $(RES)
   ifeq (0, $(shell nm /usr/lib/crt0.o | grep -c WinMainCRTStartup))
-	$(CC) $(CFLAGS) $(LDFLAGS) -DNO_WIN_MAIN -o $(EXE) $(SRC) $(RES)
+	$(CC) $(CFLAGS) $(LDFLAGS) -DNO_WIN_MAIN -o $(OUT) $(SRC) $(RES)
   else
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(EXE) $(SRC) $(RES)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(OUT) $(SRC) $(RES)
   endif
-	strip $(EXE)
+	strip $(OUT)
 
 $(LAUNCH) : $(LAUNCH_SRC) $(RES)
 	@# gcc 4.3.2? or later doesn't support "-mno-cygwin" flag.
@@ -51,16 +57,16 @@
 	windres -O coff -o $(RES) $(RC)
 
 clean :
-	rm -f $(EXE) $(RC) $(RES) $(LAUNCH) $(ARCHIVE)
+	rm -f $(EXE) $(OUT) $(RC) $(RES) $(LAUNCH) $(ARCHIVE)
 
 install : $(EXE)
-	@ install -v $(EXE) $(BINDIR)/$(EXE)
+	@ install -v $(OUT) $(BINDIR)/$(OUT)
 	@ if [ ! -f $(BINDIR)/$(CFG) ]; then \
 	    install -v $(CFG) $(BINDIR)/$(CFG) \
 	; fi
 
 uninstall :
-	rm -f $(BINDIR)/$(EXE)
+	rm -f $(BINDIR)/$(OUT)
 	rm -f $(BINDIR)/$(CFG)
 
 $(ARCHIVE) : $(SRC) $(ICO) $(CFG) $(LAUNCH_SRC) README README-j Makefile

diff -r d3fd0dd5980f -r 42df141c8934 README
--- a/README	Fri Dec 27 17:34:32 2013 +0900
+++ b/README	Fri Dec 27 17:37:16 2013 +0900
@@ -266,6 +266,12 @@
                 zsh 4.3.10
 
 // C H A N G E S //
+v1.07_24.mod 2013/12/27 (by xax_jp)
+        * cygterm64.exe is launch preferentially the case where cyglaunch detected 64bit Cygwin.
+        * cygterm startup from a current directory by cyglaunch.
+        * fixed cyglaunch does not launch from on cygwin.
+
+
 v1.07_24 2013/08/15 (by maya)
         * Support for 64bit Cygwin.
 

diff -r d3fd0dd5980f -r 42df141c8934 README-j
--- a/README-j	Fri Dec 27 17:34:32 2013 +0900
+++ b/README-j	Fri Dec 27 17:37:16 2013 +0900
@@ -278,6 +278,13 @@
                 zsh 4.3.10
 
 // 変 更 履 歴 //
+v1.07_24.mod 2013/12/27 (by xax_jp)
+        * cyglaunch が 64bit Cygwin を検出した場合， cygterm64.exe を
+          優先的に起動するようにした。
+        * cyglaunch を立ち上げた時，カレントディレクトリから cygterm が
+          起動するようにした。
+        * cygwin 上から cyglaunch が起動できないのを修正
+
 v1.07_24 2013/08/15 (by maya)
         * 64bit Cygwin でも動作するようにした。
 

diff -r d3fd0dd5980f -r 42df141c8934 cyglaunch.c
--- a/cyglaunch.c	Fri Dec 27 17:34:32 2013 +0900
+++ b/cyglaunch.c	Fri Dec 27 17:37:16 2013 +0900
@@ -10,8 +10,14 @@
 //
 
 #include <windows.h>
+#include <winnt.h>
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef NO_WIN_MAIN
+#include <unistd.h>
+#else
+#include <direct.h>
+#endif
 
 
 #define Section "Tera Term"
@@ -19,17 +25,58 @@
 
 
 //
+// Get Cygwin architecture
+//
+WORD GetCygwinArch(const char *CygDir)
+{
+	WORD result = IMAGE_FILE_MACHINE_UNKNOWN;
+	char cygdll[MAX_PATH];
+	FILE *fp = NULL;
+	IMAGE_DOS_HEADER DosHeader;
+	IMAGE_NT_HEADERS32 Cygwin1DllHeader;
+
+	strcpy(cygdll, CygDir);
+	strcat(cygdll, "\\bin\\cygwin1.dll");
+
+	// Get PE header
+	fp = fopen(cygdll, "r");
+	if(fp == NULL) {
+		goto finally;
+	}
+	if(fread(&DosHeader, sizeof(DosHeader), 1, fp) < 1) {
+		goto finally;
+	}
+	if(fseek(fp, DosHeader.e_lfanew, SEEK_SET) != 0) {
+		goto finally;
+	}
+	if(fread(&Cygwin1DllHeader, sizeof(Cygwin1DllHeader), 1, fp) < 1) {
+		goto finally;
+	}
+
+	// check architecture
+	result = Cygwin1DllHeader.FileHeader.Machine;
+
+finally:
+	if(fp != NULL) {
+		fclose(fp);
+	}
+	return result;
+}
+
+
+//
 // Connect to local cygwin
 //
-void OnCygwinConnection(char *CygwinDirectory, char *cmdline)
+void OnCygwinConnection(char *CygwinDirectory, char *cmdline, char *curdir)
 {
 	char file[MAX_PATH];
 	char c, *envptr, *envbuff;
 	int envbufflen;
-	char *exename = "cygterm.exe";
+	char *exename[] = { "cygterm64.exe", "cygterm.exe" };
 	char cmd[1024];
 	STARTUPINFO si;
 	PROCESS_INFORMATION pi;
+	int i;
 
 	envptr = getenv("PATH");
 	if (strstr(envptr, "cygwin\\bin") != NULL) {
@@ -74,20 +121,29 @@
 
 found_path:;
 	memset(&si, 0, sizeof(si));
-	GetStartupInfo(&si);
+	si.cb = sizeof(si);
 	memset(&pi, 0, sizeof(pi));
 
-	strcpy(cmd, exename);
-	strcat(cmd, " ");
-	strncat(cmd, cmdline, sizeof(cmd)-strlen(cmd)-1);
+	for(i = (GetCygwinArch(CygwinDirectory) == IMAGE_FILE_MACHINE_AMD64 ? 0 : 1);
+		i < _countof(exename);
+		i++) {
+		strcpy(cmd, exename[i]);
+		strcat(cmd, " ");
+		strncat(cmd, cmdline, sizeof(cmd)-strlen(cmd)-1);
 //printf("%s", cmd);
 //MessageBox(NULL, cmd, "", MB_OK);
-	if (CreateProcess(
-			NULL,
-			cmd,
-			NULL, NULL, FALSE, 0,
-			NULL, NULL,
-			&si, &pi) == 0) {
+		if (CreateProcess(
+				NULL,
+				cmd,
+				NULL, NULL, FALSE, 0,
+				NULL, curdir,
+				&si, &pi)) {
+			CloseHandle(pi.hProcess);
+			CloseHandle(pi.hThread);
+			break;
+		}
+	}
+	if (i >= _countof(exename)) {
 		MessageBox(NULL, "Can't execute Cygterm.", "ERROR", MB_OK | MB_ICONWARNING);
 	}
 }
@@ -96,10 +152,13 @@
 int main(int argc, char** argv)
 {
 	char Temp[256], CygwinDir[256], Cmdline[256];
+	char CurDir[MAX_PATH + 1];
+	char *retdir;
 	char *bs;
 	int i;
 	BOOL d_opt=FALSE;
 
+	retdir = _getcwd(CurDir, sizeof(CurDir));
 	if (GetModuleFileName(NULL, Temp, sizeof(Temp)) > 0 &&
 	   (bs = strrchr(Temp, '\\')) != NULL) {
 		*bs = 0;
@@ -135,7 +194,14 @@
 	}
 	//printf("%s\n", Cmdline);
 
-	OnCygwinConnection(CygwinDir, Cmdline);
+	OnCygwinConnection(CygwinDir, Cmdline, retdir);
 
 	return 0;
 }
+
+#ifdef NO_WIN_MAIN
+// This program is an Win32 application but, start as Cygwin main().
+//------------------------------------------------------------------
+void mainCRTStartup(void);
+void WinMainCRTStartup(void) { mainCRTStartup(); }
+#endif