emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add platform tweaks

Browse Source 
login: consider platforms having no domainname field in the utsname struct
include/platform.h: define IUCLC to 0 on platforms where it is not defined

Signed-off-by: Luca Favatella <slackydeb@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-05-19 13:18:45 +02:00
parent 167cd709df
commit 5a49d284a6
2 changed files with 89 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
include/platform.h
View File

@ -19,7 +19,7 @@
/* __restrict is known in EGCS 1.2 and above. */ /* __restrict is known in EGCS 1.2 and above. */
#if !__GNUC_PREREQ(2,92) #if !__GNUC_PREREQ(2,92)
# ifndef __restrict # ifndef __restrict
# define __restrict /* Ignore */ # define __restrict
# endif # endif
#endif #endif
@ -61,14 +61,14 @@
# define DEPRECATED __attribute__ ((__deprecated__)) # define DEPRECATED __attribute__ ((__deprecated__))
# define UNUSED_PARAM_RESULT __attribute__ ((warn_unused_result)) # define UNUSED_PARAM_RESULT __attribute__ ((warn_unused_result))
# else # else
# define DEPRECATED /* n/a */ # define DEPRECATED
# define UNUSED_PARAM_RESULT /* n/a */ # define UNUSED_PARAM_RESULT
# endif # endif
#else #else
# define ALWAYS_INLINE inline /* n/a */ # define ALWAYS_INLINE inline
# define NOINLINE /* n/a */ # define NOINLINE
# define DEPRECATED /* n/a */ # define DEPRECATED
# define UNUSED_PARAM_RESULT /* n/a */ # define UNUSED_PARAM_RESULT
#endif #endif
/* -fwhole-program makes all symbols local. The attribute externally_visible /* -fwhole-program makes all symbols local. The attribute externally_visible
@ -144,19 +144,19 @@
/* SWAP_LEnn means "convert CPU<->little_endian by swapping bytes" */ /* SWAP_LEnn means "convert CPU<->little_endian by swapping bytes" */
#if BB_BIG_ENDIAN #if BB_BIG_ENDIAN
#define SWAP_BE16(x) (x) # define SWAP_BE16(x) (x)
#define SWAP_BE32(x) (x) # define SWAP_BE32(x) (x)
#define SWAP_BE64(x) (x) # define SWAP_BE64(x) (x)
#define SWAP_LE16(x) bswap_16(x) # define SWAP_LE16(x) bswap_16(x)
#define SWAP_LE32(x) bswap_32(x) # define SWAP_LE32(x) bswap_32(x)
#define SWAP_LE64(x) bswap_64(x) # define SWAP_LE64(x) bswap_64(x)
#else #else
#define SWAP_BE16(x) bswap_16(x) # define SWAP_BE16(x) bswap_16(x)
#define SWAP_BE32(x) bswap_32(x) # define SWAP_BE32(x) bswap_32(x)
#define SWAP_BE64(x) bswap_64(x) # define SWAP_BE64(x) bswap_64(x)
#define SWAP_LE16(x) (x) # define SWAP_LE16(x) (x)
#define SWAP_LE32(x) (x) # define SWAP_LE32(x) (x)
#define SWAP_LE64(x) (x) # define SWAP_LE64(x) (x)
#endif #endif
/* ---- Unaligned access ------------------------------------ */ /* ---- Unaligned access ------------------------------------ */
@ -165,15 +165,15 @@
* a lvalue. This makes it more likely to not swap them by mistake * a lvalue. This makes it more likely to not swap them by mistake
*/ */
#if defined(i386) || defined(__x86_64__) #if defined(i386) || defined(__x86_64__)
#define move_from_unaligned16(v, u16p) ((v) = *(uint16_t*)(u16p)) # define move_from_unaligned16(v, u16p) ((v) = *(uint16_t*)(u16p))
#define move_from_unaligned32(v, u32p) ((v) = *(uint32_t*)(u32p)) # define move_from_unaligned32(v, u32p) ((v) = *(uint32_t*)(u32p))
#define move_to_unaligned32(u32p, v) (*(uint32_t*)(u32p) = (v)) # define move_to_unaligned32(u32p, v) (*(uint32_t*)(u32p) = (v))
/* #elif ... - add your favorite arch today! */ /* #elif ... - add your favorite arch today! */
#else #else
/* performs reasonably well (gcc usually inlines memcpy here) */ /* performs reasonably well (gcc usually inlines memcpy here) */
#define move_from_unaligned16(v, u16p) (memcpy(&(v), (u16p), 2)) # define move_from_unaligned16(v, u16p) (memcpy(&(v), (u16p), 2))
#define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4)) # define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
#define move_to_unaligned32(u32p, v) do { \ # define move_to_unaligned32(u32p, v) do { \
uint32_t __t = (v); \ uint32_t __t = (v); \
memcpy((u32p), &__t, 4); \ memcpy((u32p), &__t, 4); \
} while (0) } while (0)
@ -225,21 +225,21 @@ __extension__ typedef unsigned long long __u64;
#if defined __GLIBC__ || defined __UCLIBC__ \ #if defined __GLIBC__ || defined __UCLIBC__ \
|| defined __dietlibc__ || defined _NEWLIB_VERSION || defined __dietlibc__ || defined _NEWLIB_VERSION
#include <features.h> # include <features.h>
#define HAVE_FEATURES_H # define HAVE_FEATURES_H
#include <stdint.h> # include <stdint.h>
#define HAVE_STDINT_H # define HAVE_STDINT_H
#elif !defined __APPLE__ #elif !defined __APPLE__
/* Largest integral types. */ /* Largest integral types. */
#if __BIG_ENDIAN__ # if __BIG_ENDIAN__
typedef long intmax_t; typedef long intmax_t;
typedef unsigned long uintmax_t; typedef unsigned long uintmax_t;
#else # else
__extension__ __extension__
typedef long long intmax_t; typedef long long intmax_t;
__extension__ __extension__
typedef unsigned long long uintmax_t; typedef unsigned long long uintmax_t;
#endif # endif
#endif #endif
/* Size-saving "small" ints (arch-dependent) */ /* Size-saving "small" ints (arch-dependent) */
@ -256,20 +256,20 @@ typedef unsigned smalluint;
/* ISO C Standard: 7.16 Boolean type and values <stdbool.h> */ /* ISO C Standard: 7.16 Boolean type and values <stdbool.h> */
#if (defined __digital__ && defined __unix__) #if (defined __digital__ && defined __unix__)
/* old system without (proper) C99 support */ /* old system without (proper) C99 support */
#define bool smalluint # define bool smalluint
#else #else
/* modern system, so use it */ /* modern system, so use it */
#include <stdbool.h> # include <stdbool.h>
#endif #endif
/* Try to defeat gcc's alignment of "char message[]"-like data */ /* Try to defeat gcc's alignment of "char message[]"-like data */
#if 1 /* if needed: !defined(arch1) && !defined(arch2) */ #if 1 /* if needed: !defined(arch1) && !defined(arch2) */
#define ALIGN1 __attribute__((aligned(1))) # define ALIGN1 __attribute__((aligned(1)))
#define ALIGN2 __attribute__((aligned(2))) # define ALIGN2 __attribute__((aligned(2)))
#else #else
/* Arches which MUST have 2 or 4 byte alignment for everything are here */ /* Arches which MUST have 2 or 4 byte alignment for everything are here */
#define ALIGN1 # define ALIGN1
#define ALIGN2 # define ALIGN2
#endif #endif
@ -281,13 +281,13 @@ typedef unsigned smalluint;
#if ENABLE_NOMMU || \ #if ENABLE_NOMMU || \
(defined __UCLIBC__ && __UCLIBC_MAJOR__ >= 0 && __UCLIBC_MINOR__ >= 9 && \ (defined __UCLIBC__ && __UCLIBC_MAJOR__ >= 0 && __UCLIBC_MINOR__ >= 9 && \
__UCLIBC_SUBLEVEL__ > 28 && !defined __ARCH_USE_MMU__) __UCLIBC_SUBLEVEL__ > 28 && !defined __ARCH_USE_MMU__)
#define BB_MMU 0 # define BB_MMU 0
#define USE_FOR_NOMMU(...) __VA_ARGS__ # define USE_FOR_NOMMU(...) __VA_ARGS__
#define USE_FOR_MMU(...) # define USE_FOR_MMU(...)
#else #else
#define BB_MMU 1 # define BB_MMU 1
#define USE_FOR_NOMMU(...) # define USE_FOR_NOMMU(...)
#define USE_FOR_MMU(...) __VA_ARGS__ # define USE_FOR_MMU(...) __VA_ARGS__
#endif #endif
/* Platforms that haven't got dprintf need to implement fdprintf() in /* Platforms that haven't got dprintf need to implement fdprintf() in
@ -297,7 +297,7 @@ typedef unsigned smalluint;
/* Needed for: glibc */ /* Needed for: glibc */
/* Not needed for: dietlibc */ /* Not needed for: dietlibc */
/* Others: ?? (add as needed) */ /* Others: ?? (add as needed) */
#define fdprintf dprintf # define fdprintf dprintf
#endif #endif
#if defined(__dietlibc__) #if defined(__dietlibc__)
@ -323,7 +323,6 @@ static ALWAYS_INLINE char* strchrnul(const char *s, char c)
# define PRIu32 "u" # define PRIu32 "u"
/* use legacy setpgrp(pid_t,pid_t) for now. move to platform.c */ /* use legacy setpgrp(pid_t,pid_t) for now. move to platform.c */
# define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me,__me); } while (0) # define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me,__me); } while (0)
# if !defined ADJ_OFFSET_SINGLESHOT && defined MOD_CLKA && defined MOD_OFFSET # if !defined ADJ_OFFSET_SINGLESHOT && defined MOD_CLKA && defined MOD_OFFSET
# define ADJ_OFFSET_SINGLESHOT (MOD_CLKA | MOD_OFFSET) # define ADJ_OFFSET_SINGLESHOT (MOD_CLKA | MOD_OFFSET)
# endif # endif
@ -344,44 +343,53 @@ static ALWAYS_INLINE char* strchrnul(const char *s, char c)
#endif #endif
#if defined(__linux__) #if defined(__linux__)
#include <sys/mount.h> # include <sys/mount.h>
/* Make sure we have all the new mount flags we actually try to use. */ /* Make sure we have all the new mount flags we actually try to use. */
#ifndef MS_BIND # ifndef MS_BIND
#define MS_BIND (1<<12) # define MS_BIND (1 << 12)
#endif # endif
#ifndef MS_MOVE # ifndef MS_MOVE
#define MS_MOVE (1<<13) # define MS_MOVE (1 << 13)
#endif # endif
#ifndef MS_RECURSIVE # ifndef MS_RECURSIVE
#define MS_RECURSIVE (1<<14) # define MS_RECURSIVE (1 << 14)
#endif # endif
#ifndef MS_SILENT # ifndef MS_SILENT
#define MS_SILENT (1<<15) # define MS_SILENT (1 << 15)
#endif # endif
/* The shared subtree stuff, which went in around 2.6.15. */ /* The shared subtree stuff, which went in around 2.6.15. */
#ifndef MS_UNBINDABLE # ifndef MS_UNBINDABLE
#define MS_UNBINDABLE (1<<17) # define MS_UNBINDABLE (1 << 17)
#endif # endif
#ifndef MS_PRIVATE # ifndef MS_PRIVATE
#define MS_PRIVATE (1<<18) # define MS_PRIVATE (1 << 18)
#endif # endif
#ifndef MS_SLAVE # ifndef MS_SLAVE
#define MS_SLAVE (1<<19) # define MS_SLAVE (1 << 19)
#endif # endif
#ifndef MS_SHARED # ifndef MS_SHARED
#define MS_SHARED (1<<20) # define MS_SHARED (1 << 20)
#endif # endif
#ifndef MS_RELATIME # ifndef MS_RELATIME
#define MS_RELATIME (1 << 21) # define MS_RELATIME (1 << 21)
# endif
# if !defined(BLKSSZGET)
# define BLKSSZGET _IO(0x12, 104)
# endif
# if !defined(BLKGETSIZE64)
# define BLKGETSIZE64 _IOR(0x12,114,size_t)
# endif
#endif #endif
#if !defined(BLKSSZGET) /* The field domainname of struct utsname is Linux specific. */
#define BLKSSZGET _IO(0x12, 104) #if !defined(__linux__)
#endif # define HAVE_NO_UTSNAME_DOMAINNAME
#if !defined(BLKGETSIZE64)
#define BLKGETSIZE64 _IOR(0x12,114,size_t)
#endif #endif
/* If this system doesn't have IUCLC bit in struct termios::c_iflag... */
#ifndef IUCLC
# define IUCLC 0
#endif #endif
#endif #endif

2
libbb/login.c
View File

@ -62,10 +62,12 @@ void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
case 'm': case 'm':
outbuf = uts.machine; outbuf = uts.machine;
break; break;
#ifndef HAVE_NO_UTSNAME_DOMAINNAME
case 'D': case 'D':
case 'o': case 'o':
outbuf = uts.domainname; outbuf = uts.domainname;
break; break;
#endif
case 'd': case 'd':
strftime(buf, sizeof(buf), fmtstr_d, localtime(&t)); strftime(buf, sizeof(buf), fmtstr_d, localtime(&t));
break; break;