next portion of libc_hidden_proto removal

[uclinux-h8/uClibc.git] / libc / sysdeps / linux / common / ssp.c

diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c
index 49d2cbf..b939b4e 100644 (file)
--- a/libc/sysdeps/linux/common/ssp.c
+++ b/libc/sysdeps/linux/common/ssp.c
@@ -26,20 +26,27 @@
 # define SSP_SIGTYPE SIGABRT
 #endif
 
-#define openlog __openlog
-#define syslog __syslog
-#define closelog __closelog
-#define sigfillset __sigfillset_internal
-#define sigdelset __sigdelset_internal
-#define sigaction __sigaction_internal
-#define kill __kill
-
 #include <string.h>
 #include <unistd.h>
 #include <signal.h>
+#if defined __UCLIBC_HAS_SYSLOG__
 #include <sys/syslog.h>
 
-static __always_inline void block_signals(void)
+libc_hidden_proto(openlog)
+libc_hidden_proto(syslog)
+libc_hidden_proto(closelog)
+#endif
+
+/* libc_hidden_proto(sigaction) */
+libc_hidden_proto(sigfillset)
+libc_hidden_proto(sigdelset)
+/* libc_hidden_proto(sigprocmask) */
+/* libc_hidden_proto(write) */
+libc_hidden_proto(kill)
+/* libc_hidden_proto(getpid) */
+/* libc_hidden_proto(_exit) */
+
+static void block_signals(void)
 {
        struct sigaction sa;
        sigset_t mask;
@@ -47,57 +54,58 @@ static __always_inline void block_signals(void)
        sigfillset(&mask);
 
        sigdelset(&mask, SSP_SIGTYPE);  /* Block all signal handlers */
-       __sigprocmask(SIG_BLOCK, &mask, NULL);  /* except SSP_SIGTYPE */
+       sigprocmask(SIG_BLOCK, &mask, NULL);    /* except SSP_SIGTYPE */
 
        /* Make the default handler associated with the signal handler */
-       __memset(&sa, 0, sizeof(struct sigaction));
+       memset(&sa, 0, sizeof(struct sigaction));
        sigfillset(&sa.sa_mask);        /* Block all signals */
        sa.sa_flags = 0;
        sa.sa_handler = SIG_DFL;
        sigaction(SSP_SIGTYPE, &sa, NULL);
 }
 
-static __always_inline void ssp_write(int fd, const char *msg1, const char *msg2, const char *msg3)
+static void ssp_write(int fd, const char *msg1, const char *msg2, const char *msg3) __cold
 {
-       __write(fd, msg1, __strlen(msg1));
-       __write(fd, msg2, __strlen(msg2));
-       __write(fd, msg3, __strlen(msg3));
-       __write(fd, "()\n", 3);
+       write(fd, msg1, strlen(msg1));
+       write(fd, msg2, strlen(msg2));
+       write(fd, msg3, strlen(msg3));
+       write(fd, "()\n", 3);
+#if defined __UCLIBC_HAS_SYSLOG__
        openlog("ssp", LOG_CONS | LOG_PID, LOG_USER);
        syslog(LOG_INFO, "%s%s%s()", msg1, msg2, msg3);
        closelog();
+#endif
 }
 
-static __always_inline attribute_noreturn void terminate(void)
+static attribute_noreturn void terminate(void)
 {
-       (void) kill(__getpid(), SSP_SIGTYPE);
+       (void) kill(getpid(), SSP_SIGTYPE);
        _exit(127);
 }
 
-void attribute_noreturn __stack_smash_handler(char func[], int damaged __attribute__ ((unused)));
-void attribute_noreturn __stack_smash_handler(char func[], int damaged)
+void __stack_smash_handler(char func[], int damaged __attribute__ ((unused))) attribute_noreturn __cold;
+void __stack_smash_handler(char func[], int damaged)
 {
-       extern char *__progname;
        static const char message[] = ": stack smashing attack in function ";
 
        block_signals();
 
-       ssp_write(STDERR_FILENO, __progname, message, func);
+       ssp_write(STDERR_FILENO, __uclibc_progname, message, func);
 
        /* The loop is added only to keep gcc happy. */
        while(1)
                terminate();
 }
 
-void attribute_noreturn __stack_chk_fail(void)
+void __stack_chk_fail(void) attribute_noreturn __cold;
+void __stack_chk_fail(void)
 {
-       extern char *__progname;
        static const char msg1[] = "stack smashing detected: ";
        static const char msg3[] = " terminated";
 
        block_signals();
 
-       ssp_write(STDERR_FILENO, msg1, __progname, msg3);
+       ssp_write(STDERR_FILENO, msg1, __uclibc_progname, msg3);
 
        /* The loop is added only to keep gcc happy. */
        while(1)
@@ -105,15 +113,15 @@ void attribute_noreturn __stack_chk_fail(void)
 }
 
 #if 0
-void attribute_noreturn __chk_fail(void)
+void __chk_fail(void) attribute_noreturn;
+void __chk_fail(void)
 {
-       extern char *__progname;
        static const char msg1[] = "buffer overflow detected: ";
        static const char msg3[] = " terminated";
 
        block_signals();
 
-       ssp_write(STDERR_FILENO, msg1, __progname, msg3);
+       ssp_write(STDERR_FILENO, msg1, __uclibc_progname, msg3);
 
        /* The loop is added only to keep gcc happy. */
        while(1)