X-Recipient:	archive-cygwin AT delorie DOT com
DomainKey-Signature:	a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id
	:list-unsubscribe:list-subscribe:list-archive:list-post
	:list-help:sender:mime-version:in-reply-to:references:date
	:message-id:subject:from:to:content-type; q=dns; s=default; b=sk
	9KHgKd+0qFR+dUPx06r8o+oeZN+X2ZAyotSap9ClpOPg7SF2DWI/qQV/0hjyMoOQ
	c1FElGx4Fr4GeeAPwHaHKFk1k4E2Xn4w0ljUh6+M+MOq5Gy/FPyrRu9QIcLTdNi3
	4wRcEGX25/JKduP6C40gJ3CX3YldELDAO2IqqsKRg=
DKIM-Signature:	v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id
	:list-unsubscribe:list-subscribe:list-archive:list-post
	:list-help:sender:mime-version:in-reply-to:references:date
	:message-id:subject:from:to:content-type; s=default; bh=xJhwYSv1
	8LqPq+BirMRlllNxeWE=; b=VHX4sDaXMLcXZZs/uU2kLv70btf7L9kkHDSMFQ5w
	l5hB54J5uyBenYU6uq/Zr/K+OVXeJ1TkZnDrJ33lBEvW4cXeLIC51P4IdnMbIjjS
	1f10emjVGu4z0gdgibURsjQxysTCb0Z1Ax4i+WVKT1I6l1sKyyKN4rWK4eqQaVzD
	uuc=
Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id:	<cygwin.cygwin.com>
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sourceware.org/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com
X-Spam-SWARE-Status:	No, score=-3.7 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,KHOP_THREADED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE,SPF_PASS autolearn=ham version=3.3.1
MIME-Version:	1.0
X-Received:	by 10.194.78.42 with SMTP id y10mr2490026wjw.93.1372928948882; Thu, 04 Jul 2013 02:09:08 -0700 (PDT)
In-Reply-To:	<CABEPuQ+YxNF6LTAxRTVDQqQsKvGWGuaRxx1JAH62+wZZzgsC9w@mail.gmail.com>
References:	<CABEPuQ+jEFJEQt=MGyn5m7Q+Ccs5A-i7vkk0McM=yyoCOw+Kgw AT mail DOT gmail DOT com> <20130703181504 DOT GA3182 AT ednor DOT casa DOT cgf DOT cx> <CABEPuQLW+TQ5VUVSYrCOzQ4Y5fdHNp=ymcb9r+xV7ROyYS=OBA AT mail DOT gmail DOT com> <20130703195020 DOT GC1705 AT calimero DOT vinschen DOT de> <51D49188 DOT 7000708 AT cwilson DOT fastmail DOT fm> <20130703215716 DOT GA1752 AT ednor DOT casa DOT cgf DOT cx> <51D4A7F4 DOT 80507 AT cwilson DOT fastmail DOT fm> <CABEPuQJ6V55nLo1hHO=xxAjjxsV5ahAuHj-jfWH-=Hk_hmk-eA AT mail DOT gmail DOT com> <20130704085847 DOT GK5118 AT calimero DOT vinschen DOT de> <CABEPuQ+YxNF6LTAxRTVDQqQsKvGWGuaRxx1JAH62+wZZzgsC9w AT mail DOT gmail DOT com>
Date:	Thu, 4 Jul 2013 13:09:08 +0400
Message-ID:	<CABEPuQKRz2kamtrbBF5MjxPiSRMxwJ7NhG6wRrtRXMoBm+quNg@mail.gmail.com>
Subject:	Re: MSYS mode (continue)
From:	Alexey Pavlov <alexpux AT gmail DOT com>
To:	cygwin AT cygwin DOT com

2013-06-18  Alexey Pavlov

* mount.cc: Allow using a shortened version of mount points in /etc/fstab
* utsname.h: Increase sysname fiels size.
* uname.cc: Allow changing OS name by MSYSTEM environment variable.

Index: cygwin/mount.cc
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/mount.cc,v
retrieving revision 1.100
diff -u -p -r1.100 mount.cc
--- cygwin/mount.cc 24 Apr 2013 10:16:12 -0000 1.100
+++ cygwin/mount.cc 18 Jun 2013 11:39:27 -0000
@@ -1125,8 +1125,16 @@ mount_info::from_fstab_line (char *line,
   if (!*c)
     return true;
   cend = find_ws (c);
-  *cend = '\0';
   posix_path = conv_fstab_spaces (c);
+  if (!*cend)
+   {
+     unsigned mount_flags = MOUNT_SYSTEM | MOUNT_BINARY |
MOUNT_NOPOSIX | MOUNT_NOACL;
+     int res = mount_table->add_item (native_path, posix_path, mount_flags);
+     if (res && get_errno () == EMFILE)
+       return false;
+     return true;
+   }
+  *cend = '\0';
   /* Third field: FS type. */
   c = skip_ws (cend + 1);
   if (!*c)
Index: cygwin/uname.cc
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/uname.cc,v
retrieving revision 1.31
diff -u -p -r1.31 uname.cc
--- cygwin/uname.cc 21 Jan 2013 04:38:29 -0000 1.31
+++ cygwin/uname.cc 18 Jun 2013 11:39:27 -0000
@@ -29,7 +29,9 @@ uname (struct utsname *name)
   char *snp = strstr  (cygwin_version.dll_build_date, "SNP");

   memset (name, 0, sizeof (*name));
-  __small_sprintf (name->sysname, "CYGWIN_%s", wincap.osname ());
+  char* msystem = getenv("MSYSTEM");
+  const char *msystem_cyg = "CYGWIN";
+  __small_sprintf (name->sysname, "%s_%s", msystem ? msystem :
msystem_cyg, wincap.osname ());

 #if 0
   /* Recognition of the real 64 bit CPU inside of a WOW64 system, irritates
Index: cygwin/include/sys/utsname.h
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/include/sys/utsname.h,v
retrieving revision 1.3
diff -u -p -r1.3 utsname.h
--- cygwin/include/sys/utsname.h 21 Jan 2013 04:38:31 -0000 1.3
+++ cygwin/include/sys/utsname.h 18 Jun 2013 11:39:27 -0000
@@ -17,7 +17,7 @@ extern "C" {

 struct utsname
 {
-  char sysname[20];
+  char sysname[21];
   char nodename[20];
   char release[20];
   char version[20];

--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple

- Raw text -