[patch] flock-2.21.1-remove-strmode.patch

flock-2.21.1-remove-strmode.patch (text/plain), 1.53 KB, created by Naohiro Aota on 2012-05-16 05:19:39 UTC

diff --git a/include/strutils.h b/include/strutils.h
index ef283df..ed279e8 100644
--- a/include/strutils.h
+++ b/include/strutils.h
@@ -28,8 +28,6 @@ static inline void xstrncpy(char *dest, const char *src, size_t n)
 	dest[n-1] = 0;
 }
 
-extern void strmode(mode_t mode, char *str);
-
 /* Options for size_to_human_string() */
 enum
 {
diff --git a/lib/strutils.c b/lib/strutils.c
index c40daf2..4a1d2c2 100644
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -265,45 +265,6 @@ err:
 }
 
 /*
- * Converts stat->st_mode to ls(1)-like mode string. The size of "str" must
- * be 10 bytes.
- */
-void strmode(mode_t mode, char *str)
-{
-	if (S_ISDIR(mode))
-		str[0] = 'd';
-	else if (S_ISLNK(mode))
-		str[0] = 'l';
-	else if (S_ISCHR(mode))
-		str[0] = 'c';
-	else if (S_ISBLK(mode))
-		str[0] = 'b';
-	else if (S_ISSOCK(mode))
-		str[0] = 's';
-	else if (S_ISFIFO(mode))
-		str[0] = 'p';
-	else if (S_ISREG(mode))
-		str[0] = '-';
-
-	str[1] = mode & S_IRUSR ? 'r' : '-';
-	str[2] = mode & S_IWUSR ? 'w' : '-';
-	str[3] = (mode & S_ISUID
-		? (mode & S_IXUSR ? 's' : 'S')
-		: (mode & S_IXUSR ? 'x' : '-'));
-	str[4] = mode & S_IRGRP ? 'r' : '-';
-	str[5] = mode & S_IWGRP ? 'w' : '-';
-	str[6] = (mode & S_ISGID
-		? (mode & S_IXGRP ? 's' : 'S')
-		: (mode & S_IXGRP ? 'x' : '-'));
-	str[7] = mode & S_IROTH ? 'r' : '-';
-	str[8] = mode & S_IWOTH ? 'w' : '-';
-	str[9] = (mode & S_ISVTX
-		? (mode & S_IXOTH ? 't' : 'T')
-		: (mode & S_IXOTH ? 'x' : '-'));
-	str[10] = '\0';
-}
-
-/*
  * returns exponent (2^x=n) in range KiB..PiB
  */
 static int get_exp(uint64_t n)