*
* Optimize and correcting OCRNL by Vladimir Oleynik <dzo@simtreas.ru>
*
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-#include <sys/param.h> /* MAXHOSTNAMELEN */
-#include <sys/utsname.h>
#include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
+#include <sys/utsname.h>
#define LOGIN " login: "
static const char fmtstr_d[] ALIGN1 = "%A, %d %B %Y";
static const char fmtstr_t[] ALIGN1 = "%H:%M:%S";
-void print_login_issue(const char *issue_file, const char *tty)
+void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
{
- FILE *fd;
+ FILE *fp;
int c;
char buf[256+1];
const char *outbuf;
time(&t);
uname(&uts);
- puts("\r"); /* start a new line */
+ puts("\r"); /* start a new line */
- fd = fopen(issue_file, "r");
- if (!fd)
+ fp = fopen_for_read(issue_file);
+ if (!fp)
return;
- while ((c = fgetc(fd)) != EOF) {
+ while ((c = fgetc(fp)) != EOF) {
outbuf = buf;
buf[0] = c;
buf[1] = '\0';
buf[2] = '\0';
}
if (c == '\\' || c == '%') {
- c = fgetc(fd);
+ c = fgetc(fp);
switch (c) {
case 's':
outbuf = uts.sysname;
break;
case 'n':
+ case 'h':
outbuf = uts.nodename;
break;
case 'r':
case 'm':
outbuf = uts.machine;
break;
+/* The field domainname of struct utsname is Linux specific. */
+#if defined(__linux__)
case 'D':
case 'o':
- c = getdomainname(buf, sizeof(buf) - 1);
- buf[c >= 0 ? c : 0] = '\0';
+ outbuf = uts.domainname;
break;
+#endif
case 'd':
strftime(buf, sizeof(buf), fmtstr_d, localtime(&t));
break;
case 't':
strftime(buf, sizeof(buf), fmtstr_t, localtime(&t));
break;
- case 'h':
- gethostname(buf, sizeof(buf) - 1);
- buf[sizeof(buf) - 1] = '\0';
- break;
case 'l':
outbuf = tty;
break;
}
fputs(outbuf, stdout);
}
- fclose(fd);
- fflush(stdout);
+ fclose(fp);
+ fflush_all();
}
-void print_login_prompt(void)
+void FAST_FUNC print_login_prompt(void)
{
- char buf[MAXHOSTNAMELEN+1];
-
- if (gethostname(buf, MAXHOSTNAMELEN) == 0)
- fputs(buf, stdout);
+ char *hostname = safe_gethostname();
+ fputs(hostname, stdout);
fputs(LOGIN, stdout);
- fflush(stdout);
+ fflush_all();
+ free(hostname);
}
/* Clear dangerous stuff, set PATH */
"LD_NOWARN" "\0"
"LD_KEEPDIR" "\0";
-void sanitize_env_for_suid(void)
+int FAST_FUNC sanitize_env_if_suid(void)
{
- const char *p = forbid;
+ const char *p;
+
+ if (getuid() == geteuid())
+ return 0;
+
+ p = forbid;
do {
unsetenv(p);
p += strlen(p) + 1;
} while (*p);
putenv((char*)bb_PATH_root_path);
+
+ return 1; /* we indeed were run by different user! */
}