Change strmode argument type to mode_t

Finally, we have the correct function definition for strmode. NetBSD/OpenBSD did this many years ago. This code is weird sign extension safe. Reviewed by: imp@ Pull Request: freebsd/freebsd-src#493
rcbchan · Jun 29, 2021 · 849dcdb · 849dcdb
1 parent ed1a156
commit 849dcdb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/include/string.h b/include/string.h
@@ -96,7 +96,13 @@ size_t	 strlcpy(char * __restrict, const char * __restrict, size_t);
 #endif
 size_t	 strlen(const char *) __pure;
 #if __BSD_VISIBLE
-void	 strmode(int, char *);
+
+#ifndef _MODE_T_DECLARED
+typedef	__mode_t	mode_t;
+#define	_MODE_T_DECLARED
+#endif
+
+void	 strmode(mode_t, char *);
 #endif
 char	*strncat(char * __restrict, const char * __restrict, size_t);
 int	 strncmp(const char *, const char *, size_t) __pure;

diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 
 void
-strmode(/* mode_t */ int mode, char *p)
+strmode(mode_t mode, char *p)
 {
 	 /* print type */
 	switch (mode & S_IFMT) {