From 4dd4a06595a95c9530ca5685d72d503bebf5b560 Mon Sep 17 00:00:00 2001
From: anon <anon@anon.anon>
Date: Fri, 15 Dec 2023 20:30:35 +0100
Subject: [PATCH] merged source files
---
source/logdir.c | 92 -------------------------------------------------
source/path.c | 55 +++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 92 deletions(-)
delete mode 100644 source/logdir.c
diff --git a/source/logdir.c b/source/logdir.c
deleted file mode 100644
index 34a7213..0000000
--- a/source/logdir.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*===========================================================================
- Copyright (c) 1998-2000, The Santa Cruz Operation
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- *Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- *Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- *Neither name of The Santa Cruz Operation nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
- IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT falseT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT falseT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGE.
- =========================================================================*/
-
-/*
- * logdir()
- *
- * This routine does not use the getpwent(3) library routine
- * because the latter uses the stdio package. The allocation of
- * storage in this package destroys the integrity of the shell's
- * storage allocation.
- */
-
-#include <unistd.h>
-#include <string.h>
-#include "global.h"
-
-#define OURBUFSIZ 160 /* renamed: avoid conflict with <stdio.h> */
-
-static char line[OURBUFSIZ + 1];
-
-/* Internal prototypes: */
-static char *nextfield(char *p);
-
-static char *nextfield(char *p) {
- while(*p && *p != ':')
- ++p;
- if(*p) *p++ = 0;
- return (p);
-}
-
-char *logdir(char *name) {
- char *p;
- int i, j;
- int pwf;
-
- /* attempt to open the password file */
- if((pwf = myopen("/etc/passwd", 0, 0)) == -1) return (0);
-
- /* find the matching password entry */
- do {
- /* get the next line in the password file */
- i = read(pwf, line, OURBUFSIZ);
- for(j = 0; j < i; j++)
- if(line[j] == '\n') break;
- /* return a null pointer if the whole file has been read */
- if(j >= i) return (0);
- line[++j] = 0; /* terminate the line */
- (void)lseek(pwf, (long)(j - i), 1); /* point at the next line */
- p = nextfield(line); /* get the logname */
- } while(*name != *line || /* fast pretest */
- strcmp(name, line) != 0);
- (void)close(pwf);
-
- /* skip the intervening fields */
- p = nextfield(p);
- p = nextfield(p);
- p = nextfield(p);
- p = nextfield(p);
-
- /* return the login directory */
- (void)nextfield(p);
- return (p);
-}
diff --git a/source/path.c b/source/path.c
index 0d52813..6dae90b 100644
--- a/source/path.c
+++ b/source/path.c
@@ -34,6 +34,9 @@
#include "global.h"
+#include <unistd.h>
+#include <string.h>
+
const char *basename(const char *path) {
const char *s;
@@ -217,3 +220,55 @@ char *compath(char *pathname) /*FDEF*/
return (pathname);
}
+
+static
+char *nextfield(char *p) {
+ while(*p && *p != ':')
+ ++p;
+ if(*p) *p++ = 0;
+ return (p);
+}
+
+/*
+ * logdir()
+ *
+ * This routine does not use the getpwent(3) library routine
+ * because the latter uses the stdio package. The allocation of
+ * storage in this package destroys the integrity of the shell's
+ * storage allocation.
+ */
+char *logdir(char *name) {
+ #define OURBUFSIZ 160 /* renamed: avoid conflict with <stdio.h> */
+ static char line[OURBUFSIZ + 1];
+ char *p;
+ int i, j;
+ int pwf;
+
+ /* attempt to open the password file */
+ if((pwf = myopen("/etc/passwd", 0, 0)) == -1) return (0);
+
+ /* find the matching password entry */
+ do {
+ /* get the next line in the password file */
+ i = read(pwf, line, OURBUFSIZ);
+ for(j = 0; j < i; j++)
+ if(line[j] == '\n') break;
+ /* return a null pointer if the whole file has been read */
+ if(j >= i) return (0);
+ line[++j] = 0; /* terminate the line */
+ (void)lseek(pwf, (long)(j - i), 1); /* point at the next line */
+ p = nextfield(line); /* get the logname */
+ } while(*name != *line || /* fast pretest */
+ strcmp(name, line) != 0);
+ (void)close(pwf);
+
+ /* skip the intervening fields */
+ p = nextfield(p);
+ p = nextfield(p);
+ p = nextfield(p);
+ p = nextfield(p);
+
+ /* return the login directory */
+ (void)nextfield(p);
+ return p;
+}