stty: fix columns command. closes bug 791.

[oweals/busybox.git] / libbb / mode_string.c

diff --git a/libbb/mode_string.c b/libbb/mode_string.c
index 8d4d736ef83c037a1ea857cd7658a12594c6eb96..7d4e514b1f2e24292a484289089c009e47dca4dd 100644 (file)
--- a/libbb/mode_string.c
+++ b/libbb/mode_string.c
@@ -4,25 +4,19 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
+/* Aug 13, 2003
+ * Fix a bug reported by junkio@cox.net involving the mode_chars index.
  */
 
+
 #include <assert.h>
 #include <sys/stat.h>
 
+#include "libbb.h"
+
 #if ( S_ISUID != 04000 ) || ( S_ISGID != 02000 ) || ( S_ISVTX != 01000 ) \
  || ( S_IRUSR != 00400 ) || ( S_IWUSR != 00200 ) || ( S_IXUSR != 00100 ) \
  || ( S_IRGRP != 00040 ) || ( S_IWGRP != 00020 ) || ( S_IXGRP != 00010 ) \
@@ -53,11 +47,11 @@ static const mode_t mode_flags[] = {
 
 /* The previous version used "0pcCd?bB-?l?s???".  However, the '0', 'C',
  * and 'B' types don't appear to be available on linux.  So I removed them. */
-static const char type_chars[16] = "?pc?d?b?-?l?s???";
-/*                                  0123456789abcdef */
-static const char mode_chars[7] = "rwxSTst";
+static const char type_chars[16] ALIGN1 = "?pc?d?b?-?l?s???";
+/***************************************** 0123456789abcdef */
+static const char mode_chars[7] ALIGN1 = "rwxSTst";
 
-const char *bb_mode_string(int mode)
+const char* FAST_FUNC bb_mode_string(mode_t mode)
 {
        static char buf[12];
        char *p = buf;
@@ -94,10 +88,10 @@ const char *bb_mode_string(int mode)
 /* The previous version used "0pcCd?bB-?l?s???".  However, the '0', 'C',
  * and 'B' types don't appear to be available on linux.  So I removed them. */
 static const char type_chars[16] = "?pc?d?b?-?l?s???";
-/*                                  0123456789abcdef */
+/********************************** 0123456789abcdef */
 static const char mode_chars[7] = "rwxSTst";
 
-const char *bb_mode_string(int mode)
+const char* FAST_FUNC bb_mode_string(mode_t mode)
 {
        static char buf[12];
        char *p = buf;
@@ -119,7 +113,7 @@ const char *bb_mode_string(int mode)
                } while (++j < 3);
                ++i;
                if (mode & (010000 >> i)) {
-                       *p = mode_chars[3 + k + (i >> 1)];
+                       *p = mode_chars[3 + (k & 2) + (i == 3)];
                }
        } while (i < 3);