From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: cygwin-patches@cygwin.com
Subject: Re: [PATCH v2] Introduce the 'usertemp' filesystem type
Date: Tue, 01 Dec 2015 14:12:00 -0000 [thread overview]
Message-ID: <alpine.DEB.1.00.1512011504240.1686@s15462909.onlinehome-server.info> (raw)
In-Reply-To: <3ddcb7adf1004c146964beda2f90521bb1c19d4a.1448978434.git.johannes.schindelin@gmx.de>
... and here is the interdiff vs v1 (compare also to the 'pseudo Pull
Request' at
https://github.com/dscho/msys2-runtime/compare/tempfs-cygwin-v1-rebased...tempfs-cygwin-v2):
diff --git a/winsup/cygwin/include/sys/mount.h
b/winsup/cygwin/include/sys/mount.h
index 458cf80..ec92794 100644
--- a/winsup/cygwin/include/sys/mount.h
+++ b/winsup/cygwin/include/sys/mount.h
@@ -44,7 +44,8 @@ enum
MOUNT_DOS = 0x40000, /* convert leading spaces and trailing
dots and spaces to private use area */
MOUNT_IHASH = 0x80000, /* Enforce hash values for inode numbers */
- MOUNT_BIND = 0x100000 /* Allows bind syntax in fstab file. */
+ MOUNT_BIND = 0x100000, /* Allows bind syntax in fstab file. */
+ MOUNT_USER_TEMP = 0x200000 /* Mount the user's $TMP. */
};
int mount (const char *, const char *, unsigned __flags);
diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
index be5de61..fc080c9 100644
--- a/winsup/cygwin/mount.cc
+++ b/winsup/cygwin/mount.cc
@@ -1200,14 +1200,15 @@ mount_info::from_fstab_line (char *line, bool user)
}
else if (!strcmp (fs_type, "usertemp"))
{
- WCHAR tmp[MAX_PATH];
+ WCHAR tmp[PATH_MAX + 1];
- if (GetEnvironmentVariableW (L"TEMP", tmp, sizeof(tmp)) && *tmp)
+ if (GetTempPathW (PATH_MAX, tmp))
{
- DWORD len;
- char mb_tmp[len = sys_wcstombs (NULL, 0, tmp)];
- sys_wcstombs (mb_tmp, len, tmp);
+ tmp_pathbuf tp;
+ char *mb_tmp = tp.c_get ();
+ sys_wcstombs (mb_tmp, PATH_MAX, tmp);
+ mount_flags |= MOUNT_USER_TEMP;
int res = mount_table->add_item (mb_tmp, posix_path, mount_flags);
if (res && get_errno () == EMFILE)
return false;
@@ -1670,6 +1671,9 @@ fillout_mntent (const char *native_path, const char *posix_path, unsigned flags)
if (flags & (MOUNT_BIND))
strcat (_my_tls.locals.mnt_opts, (char *) ",bind");
+ if (flags & (MOUNT_USER_TEMP))
+ strcat (_my_tls.locals.mnt_opts, (char *) ",usertemp");
+
ret.mnt_opts = _my_tls.locals.mnt_opts;
ret.mnt_freq = 1;
next prev parent reply other threads:[~2015-12-01 14:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-16 7:35 [PATCH] " Johannes Schindelin
2015-10-20 9:37 ` Corinna Vinschen
2015-10-20 11:47 ` Johannes Schindelin
2015-10-21 18:23 ` Corinna Vinschen
2015-10-22 12:45 ` Corinna Vinschen
2015-10-22 15:31 ` Johannes Schindelin
2015-12-01 14:02 ` [PATCH v2] " Johannes Schindelin
2015-12-01 14:12 ` Johannes Schindelin [this message]
2015-12-01 14:27 ` Corinna Vinschen
2015-12-01 14:50 ` Johannes Schindelin
2015-12-07 16:42 ` Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.1.00.1512011504240.1686@s15462909.onlinehome-server.info \
--to=johannes.schindelin@gmx.de \
--cc=cygwin-patches@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).