Merge pull request git-for-windows#156 from kblees/kb/symlinks

Symlink support

Author: dscho

compat/mingw.c

@@ -123,10 +123,6 @@ struct utsname{
  * trivial stubs
  */
 
-staticinlineintreadlink(constchar*path, char*buf, size_tbufsiz)
-{errno=ENOSYS; return-1}
-staticinlineintsymlink(constchar*oldpath, constchar*newpath)
-{errno=ENOSYS; return-1}
 staticinlineintfchmod(intfildes, mode_tmode)
 {errno=ENOSYS; return-1}
 #ifndef__MINGW64_VERSION_MAJOR
@@ -218,6 +214,8 @@ int setitimer(int type, struct itimerval *in, struct itimerval *out);
 intsigaction(intsig, structsigaction*in, structsigaction*out);
 intlink(constchar*oldpath, constchar*newpath);
 intuname(structutsname*buf);
+intsymlink(constchar*target, constchar*link);
+intreadlink(constchar*path, char*buf, size_tbufsiz);
 
 /*
  * replacements of existing functions
@@ -450,6 +448,8 @@ static inline void convert_slashes(char *path)
 intmingw_offset_1st_component(constchar*path);
 #defineoffset_1st_component mingw_offset_1st_component
 #definePATH_SEP ''
+externchar*mingw_query_user_email(void);
+#definequery_user_email mingw_query_user_email
 #if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) ||_MSC_VER<1800)
 #definePRIuMAX "I64u"
 #definePRId64 "I64d"

compat/mingw.h

@@ -6,10 +6,12 @@
 #include<windows.h>
 #endif
 
-staticinlineintfile_attr_to_st_mode (DWORDattr)
+staticinlineintfile_attr_to_st_mode (DWORDattr, DWORDtag)
 {
 intfMode=S_IREAD;
-if (attr&FILE_ATTRIBUTE_DIRECTORY)
+if ((attr&FILE_ATTRIBUTE_REPARSE_POINT) &&tag==IO_REPARSE_TAG_SYMLINK)
+fMode |= S_IFLNK;
+elseif (attr&FILE_ATTRIBUTE_DIRECTORY)
 fMode |= S_IFDIR;
 else
 fMode |= S_IFREG;

compat/win32.h

@@ -16,7 +16,10 @@ static inline void finddata2dirent(struct dirent *ent, WIN32_FIND_DATAW *fdata)
 xwcstoutf(ent->d_name, fdata->cFileName, MAX_PATH*3);
 
 /* Set file type, based on WIN32_FIND_DATA */
-if (fdata->dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)
+if ((fdata->dwFileAttributes&FILE_ATTRIBUTE_REPARSE_POINT)
+&&fdata->dwReserved0==IO_REPARSE_TAG_SYMLINK)
+ent->d_type=DT_LNK;
+elseif (fdata->dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)
 ent->d_type=DT_DIR;
 else
 ent->d_type=DT_REG;

compat/win32/dirent.c

@@ -149,9 +149,10 @@ static struct fsentry *fseentry_create_entry(struct fsentry *list,
 
 fse=fsentry_alloc(list, buf, len);
 
-fse->st_mode=file_attr_to_st_mode(fdata->dwFileAttributes);
-fse->st_size= (((off64_t) (fdata->nFileSizeHigh)) << 32)
- | fdata->nFileSizeLow;
+fse->st_mode=file_attr_to_st_mode(fdata->dwFileAttributes,
+fdata->dwReserved0);
+fse->st_size=S_ISLNK(fse->st_mode) ? MAX_LONG_PATH :
+fdata->nFileSizeLow | (((off_t) fdata->nFileSizeHigh) << 32);
 fse->st_atime=filetime_to_time_t(&(fdata->ftLastAccessTime));
 fse->st_mtime=filetime_to_time_t(&(fdata->ftLastWriteTime));
 fse->st_ctime=filetime_to_time_t(&(fdata->ftCreationTime));
@@ -442,7 +443,8 @@ static struct dirent *fscache_readdir(DIR *base_dir)
 if (!next)
 returnNULL;
 dir->pfsentry=next;
-dir->dirent.d_type=S_ISDIR(next->st_mode) ? DT_DIR : DT_REG;
+dir->dirent.d_type=S_ISREG(next->st_mode) ? DT_REG :
+S_ISDIR(next->st_mode) ? DT_DIR : DT_LNK;
 dir->dirent.d_name= (char*) next->name;
 return&(dir->dirent);
 }

compat/win32/fscache.c

@@ -7,6 +7,7 @@
 #include<wingdi.h>
 #include<winreg.h>
 #include"win32.h"
+#include"win32/lazyload.h"
 
 staticintfd_is_interactive[3] ={0, 0, 0 };
 #defineFD_CONSOLE 0x1
@@ -41,26 +42,21 @@ typedef struct _CONSOLE_FONT_INFOEX{
 #endif
 #endif
 
-typedefBOOL (WINAPI*PGETCURRENTCONSOLEFONTEX)(HANDLE, BOOL,
-PCONSOLE_FONT_INFOEX);
-
 staticvoidwarn_if_raster_font(void)
 {
 DWORDfontFamily=0;
-PGETCURRENTCONSOLEFONTEXpGetCurrentConsoleFontEx;
+DECLARE_PROC_ADDR(kernel32.dll, BOOL, GetCurrentConsoleFontEx,
+HANDLE, BOOL, PCONSOLE_FONT_INFOEX);
 
 /* don't bother if output was ascii only */
 if (!non_ascii_used)
 return;
 
 /* GetCurrentConsoleFontEx is available since Vista */
-pGetCurrentConsoleFontEx= (PGETCURRENTCONSOLEFONTEX) GetProcAddress(
-GetModuleHandle("kernel32.dll"),
-"GetCurrentConsoleFontEx");
-if (pGetCurrentConsoleFontEx){
+if (INIT_PROC_ADDR(GetCurrentConsoleFontEx)){
 CONSOLE_FONT_INFOEXcfi;
 cfi.cbSize=sizeof(cfi);
-if (pGetCurrentConsoleFontEx(console, 0, &cfi))
+if (GetCurrentConsoleFontEx(console, 0, &cfi))
 fontFamily=cfi.FontFamily;
  } else{
 /* pre-Vista: check default console font in registry */

compat/winansi.c

@@ -392,6 +392,10 @@ static inline char *git_find_last_dir_sep(const char *path)
 #definefind_last_dir_sep git_find_last_dir_sep
 #endif
 
+#ifndefquery_user_email
+#definequery_user_email() NULL
+#endif
+
 #if defined(__HP_cc) && (__HP_cc >= 61000)
 #defineNORETURN __attribute__((noreturn))
 #defineNORETURN_PTR

git-compat-util.h

@@ -168,6 +168,9 @@ const char *ident_default_email(void)
 strbuf_addstr(&git_default_email, email);
 committer_ident_explicitly_given |= IDENT_MAIL_GIVEN;
 author_ident_explicitly_given |= IDENT_MAIL_GIVEN;
+ } elseif ((email=query_user_email()) &&email[0]){
+strbuf_addstr(&git_default_email, email);
+free((char*)email);
  } else
 copy_email(xgetpwuid_self(&default_email_is_bogus),
 &git_default_email, &default_email_is_bogus);

ident.c

@@ -17,14 +17,14 @@ static void trim_last_path_component(struct strbuf *path)
 inti=path->len;
 
 /* back up past trailing slashes, if any */
-while (i&&path->buf[i-1]=='/')
+while (i&&is_dir_sep(path->buf[i-1]))
 i--;
 
 /*
  * then go backwards until a slash, or the beginning of the
  * string
  */
-while (i&&path->buf[i-1]!='/')
+while (i&&!is_dir_sep(path->buf[i-1]))
 i--;
 
 strbuf_setlen(path, i);

lockfile.c

@@ -459,30 +459,25 @@ ssize_t strbuf_write(struct strbuf *sb, FILE *f)
 }
 
 
-#defineSTRBUF_MAXLINK (2*PATH_MAX)
-
 intstrbuf_readlink(structstrbuf*sb, constchar*path, size_thint)
 {
 size_toldalloc=sb->alloc;
 
 if (hint<32)
 hint=32;
 
-while (hint<STRBUF_MAXLINK){
+for (; hint*= 2){
 intlen;
 
-strbuf_grow(sb, hint);
-len=readlink(path, sb->buf, hint);
+strbuf_grow(sb, hint+1);
+len=readlink(path, sb->buf, hint+1);
 if (len<0){
 if (errno!=ERANGE)
 break;
- } elseif (len<hint){
+ } elseif (len <=hint){
 strbuf_setlen(sb, len);
 return0;
  }
-
-/* .. the buffer was too small - try again */
-hint *= 2;
  }
 if (oldalloc==0)
 strbuf_release(sb);