Skip to contentSkip to conversation

MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility

PATCH In review Sebastian Schuberth 4 participants 10 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility

MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility

---
 compat/mingw.h |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
compat/mingw.h +6 -5
index b3d299f..af2f810 100644
@@ -6,6 +6,7 @@
  */
 
 typedef int pid_t;
+typedef int uid_t;
 #define hstrerror strerror
 
 #define S_IFLNK    0120000 /* Symbolic link */
@@ -75,17 +76,17 @@ static inline int symlink(const char *oldpath, const char *newpath)
 { errno = ENOSYS; return -1; }
 static inline int fchmod(int fildes, mode_t mode)
 { errno = ENOSYS; return -1; }
-static inline int fork(void)
+static inline pid_t fork(void)
 { errno = ENOSYS; return -1; }
 static inline unsigned int alarm(unsigned int seconds)
 { return 0; }
 static inline int fsync(int fd)
 { return 0; }
-static inline int getppid(void)
+static inline pid_t getppid(void)
 { return 1; }
 static inline void sync(void)
 {}
-static inline int getuid()
+static inline uid_t getuid()
 { return 1; }
 static inline struct passwd *getpwnam(const char *name)
 { return NULL; }
@@ -117,7 +118,7 @@ static inline int mingw_unlink(const char *pathname)
 }
 #define unlink mingw_unlink
 
-static inline int waitpid(pid_t pid, int *status, unsigned options)
+static inline pid_t waitpid(pid_t pid, int *status, unsigned options)
 {
 	if (options == 0)
 		return _cwait(status, pid, 0);
@@ -158,7 +159,7 @@ int poll(struct pollfd *ufds, unsigned int nfds, int timeout);
 struct tm *gmtime_r(const time_t *timep, struct tm *result);
 struct tm *localtime_r(const time_t *timep, struct tm *result);
 int getpagesize(void);	/* defined in MinGW's libgcc.a */
-struct passwd *getpwuid(int uid);
+struct passwd *getpwuid(uid_t uid);
 int setitimer(int type, struct itimerval *in, struct itimerval *out);
 int sigaction(int sig, struct sigaction *in, struct sigaction *out);
 int link(const char *oldpath, const char *newpath);
Signature · 1 line
1.6.5.rc2.13.g1be2
#1 lore raw
Quoted 1 line · Sebastian Schuberth

MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility

Why this? Compatibility with what? What's the problem with the status quo?

-- Hannes

#2 lore raw
Quoted 4 lines · Johannes Sixt
Quoted 2 lines

MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility

Why this? Compatibility with what? What's the problem with the status quo?

I wanted to include Hany's Dos2Unix tool (hd2u) into msysGit. h2du depends on libpopt, and either of the two requires the uid_t type, I do not recall which. And while adding the missing uid_t, I felt it would be right to actually use uid_t / pid_t in the function prototypes.

Signature · 1 line
Sebastian Schuberth
#3 lore raw
Quoted 5 lines · Sebastian Schuberth
Quoted 3 lines · Johannes Sixt
Quoted 2 lines

MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility

Quoted 8 lines
Quoted 1 line

Why this? Compatibility with what? What's the problem with the status quo?

I wanted to include Hany's Dos2Unix tool (hd2u) into msysGit. h2du depends on libpopt, and either of the two requires the uid_t type, I do not recall which. And while adding the missing uid_t, I felt it would be right to actually use uid_t / pid_t in the function prototypes.

Perhaps I'm missing something here... why do you need to modify the git-sources in order to include an external tool?

Signature · 1 line
Erik "kusma" Faye-Lund
#4 lore raw
Quoted 10 lines · Erik Faye-Lund
Quoted 7 lines
Quoted 1 line

Why this? Compatibility with what? What's the problem with the status quo?

I wanted to include Hany's Dos2Unix tool (hd2u) into msysGit. h2du depends on libpopt, and either of the two requires the uid_t type, I do not recall which. And while adding the missing uid_t, I felt it would be right to actually use uid_t / pid_t in the function prototypes.

Perhaps I'm missing something here... why do you need to modify the git-sources in order to include an external tool?

Because I'm building that external tool in the msysGit environment. As you know, the way we include external tools (like vim, unzip etc.) to the msysGit distribution is to create release.sh scripts that download the sources, apply patches, and build the tool. Patching the original hd2u sources to include compat/mingw.h was the best way that I saw to get some required symbols, with only two symbols missing, and those missing symbols are added by my patches.

Anyway, IMHO the correct declaration of e.g. getuid() is not "int getuid()", but "uid_t getuid()" etc. So even if the uid_t type was not required, it's a good change I think.

Signature · 1 line
Sebastian Schuberth
#5 lore raw

Hi,

Quoted 3 lines · Sebastian Schuberth

Anyway, IMHO the correct declaration of e.g. getuid() is not "int getuid()", but "uid_t getuid()" etc. So even if the uid_t type was not required, it's a good change I think.

FWIW I concur with this reasoning. Even if in this particular case, we could work around the issue, it is basically a non-intrusive, minimal janitorial patch. Especially since the original author of the wrong signature concurs.

Ciao,
Dscho

#6 lore raw
In reply to Sebastian Schuberth
Quoted 7 lines · Sebastian Schuberth
Quoted 3 lines · Johannes Sixt
Quoted 2 lines

MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility

Why this? Compatibility with what? What's the problem with the status quo?

I wanted to include Hany's Dos2Unix tool (hd2u) into msysGit.

We have dos2unix. What's wrong with it?

-- Hannes

#7 lore raw

Hi,

Quoted 10 lines · Johannes Sixt
Quoted 7 lines · Sebastian Schuberth
Quoted 3 lines · Johannes Sixt
Quoted 2 lines

MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility

Why this? Compatibility with what? What's the problem with the status quo?

I wanted to include Hany's Dos2Unix tool (hd2u) into msysGit.

We have dos2unix. What's wrong with it?

hd2u can handle mixed line endings, and it has a dry run mode IIUC.

Ciao,
Dscho

#8 lore raw

Hi,

Quoted 7 lines · Johannes Schindelin
Quoted 5 lines · Johannes Sixt
Quoted 4 lines · Sebastian Schuberth
Quoted 2 lines · Johannes Sixt
Quoted 2 lines

MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

Why this? Compatibility with what? What's the problem with the status quo?

I wanted to include Hany's Dos2Unix tool (hd2u) into msysGit.

We have dos2unix. What's wrong with it?

hd2u can handle mixed line endings, and it has a dry run mode IIUC.

Having said that, I strongly feel this issue is over-discussed. We'll just carry the necessary patches in 4msysgit.git and you can do what you want.

Ciao,
Dscho

#9 lore raw
In reply to Johannes Schindelin
Quoted 5 lines · Johannes Schindelin
Quoted 3 lines
Quoted 1 line

I wanted to include Hany's Dos2Unix tool (hd2u) into msysGit.

We have dos2unix. What's wrong with it?

hd2u can handle mixed line endings, and it has a dry run mode IIUC.

Right. One of the best features over dos2unix IMHO is that hd2u can detect line-endings (and any problems like mixed / stray line-endings) without actually modifying any files. This makes it a very nice tool to detect any line-ending issues in the working tree of cross-platform projects due to wrong autocrlf configurations.

Signature · 1 line
Sebastian Schuberth