ESH

Update libutil files

Diffstat

11 files changed, 22 insertions, 28 deletions

diff --git a/src/bltn.c b/src/bltn.c
index 7e06b2c..8ef57b3 100644
--- a/src/bltn.c
+++ b/src/bltn.c
@@ -33,9 +33,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 #include "alias.h"
 #include "bltn.h"
 #include "esh.h"
-#include "util/error.h"
-
-#include "cll/optget.h"
 
 #include <stdio.h>
 
diff --git a/src/bltns/cd.c b/src/bltns/cd.c
index 3c20798..7a105fa 100644
--- a/src/bltns/cd.c
+++ b/src/bltns/cd.c
@@ -30,7 +30,7 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#include "../cll/optget.h"
+#include "../util/optget.h"
 
 #include <unistd.h>
 
diff --git a/src/bltns/eval.c b/src/bltns/eval.c
index 6c70612..aafff88 100644
--- a/src/bltns/eval.c
+++ b/src/bltns/eval.c
@@ -31,10 +31,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
 #include "../esh.h"
+#include "../util/optget.h"
 #include "../util/util.h"
 
-#include "../cll/optget.h"
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/bltns/pwd.c b/src/bltns/pwd.c
index 6ae9fe9..72ccb55 100644
--- a/src/bltns/pwd.c
+++ b/src/bltns/pwd.c
@@ -30,7 +30,7 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#include "../cll/optget.h"
+#include "../util/optget.h"
 
 #include <unistd.h>
 
diff --git a/src/bltns/set.c b/src/bltns/set.c
index fd50ebc..dca6da2 100644
--- a/src/bltns/set.c
+++ b/src/bltns/set.c
@@ -32,9 +32,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 
 #include "../conf.h"
 #include "../util/error.h"
-
-#include "../cll/optget.h"
-#include "../cll/strconv.h"
+#include "../util/optget.h"
+#include "../util/strconv.h"
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/src/main.c b/src/main.c
index d91060c..940c1bc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -41,10 +41,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 #include "esh.h"
 #include "lineread.h"
 #include "util/error.h"
+#include "util/optget.h"
 #include "util/util.h"
 
-#include "cll/optget.h"
-
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/cll/optget.c b/src/util/optget.c
similarity index 98%
rename from src/cll/optget.c
rename to src/util/optget.c
index da61ebd..24d334d 100644
--- a/src/cll/optget.c
+++ b/src/util/optget.c
@@ -1,5 +1,5 @@
-// optget.h, version 1.6.0
-// optget source file for OMKOV lib
+// util/optget.h, version 1.6.1
+// optget source file from libutil
 // Copyright (C) 2020, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/cll/optget.h b/src/util/optget.h
similarity index 91%
rename from src/cll/optget.h
rename to src/util/optget.h
index f83d132..e3065fb 100644
--- a/src/cll/optget.h
+++ b/src/util/optget.h
@@ -1,5 +1,5 @@
-// optget.h, version 1.6.0
-// optget header file for OMKOV lib
+// util/optget.h, version 1.6.1
+// optget header file from libutil
 // Copyright (C) 2020, Jakob Wakeling
 // All rights reserved.
 
@@ -30,8 +30,8 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#ifndef OMKOV_LIB_OPTGET_H_W3LIZK1S
-#define OMKOV_LIB_OPTGET_H_W3LIZK1S
+#ifndef UTIL_OPTGET_H_W3LIZK1S
+#define UTIL_OPTGET_H_W3LIZK1S
 
 #define ARG_NUL 0
 #define ARG_REQ 1
@@ -52,4 +52,4 @@ extern const struct opt OPTGET_INIT;
 
 extern int optget(struct opt *opt, char *av[], int flags);
 
-#endif // OMKOV_LIB_OPTGET_H_W3LIZK1S
+#endif // UTIL_OPTGET_H_W3LIZK1S
diff --git a/src/cll/strconv.h b/src/util/strconv.h
similarity index 91%
rename from src/cll/strconv.h
rename to src/util/strconv.h
index e93c101..655ef06 100644
--- a/src/cll/strconv.h
+++ b/src/util/strconv.h
@@ -1,5 +1,5 @@
-// strconv.h, version 1.1.0
-// String conversion header file for OMKOV lib
+// util/strconv.h, version 1.1.1
+// String conversion header file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
@@ -30,8 +30,8 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#ifndef OMKOV_LIB_STRCONV_H_3EQMSZZK
-#define OMKOV_LIB_STRCONV_H_3EQMSZZK
+#ifndef UTIL_STRCONV_H_3EQMSZZK
+#define UTIL_STRCONV_H_3EQMSZZK
 
 #include <stdint.h>
 
@@ -45,4 +45,4 @@ uint16_t strtou16(const char *nptr, char **endptr, register int base);
 uint32_t strtou32(const char *nptr, char **endptr, register int base);
 uint64_t strtou64(const char *nptr, char **endptr, register int base);
 
-#endif // OMKOV_LIB_STRCONV_H_3EQMSZZK
+#endif // UTIL_STRCONV_H_3EQMSZZK
diff --git a/src/cll/strtoi.c b/src/util/strtoi.c
similarity index 98%
rename from src/cll/strtoi.c
rename to src/util/strtoi.c
index 7951000..b3d94dc 100644
--- a/src/cll/strtoi.c
+++ b/src/util/strtoi.c
@@ -1,5 +1,5 @@
-// strtoi.c, version 1.1.0
-// String conversion source file for OMKOV lib
+// util/strtoi.c, version 1.1.1
+// String conversion source file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/cll/strtou.c b/src/util/strtou.c
similarity index 98%
rename from src/cll/strtou.c
rename to src/util/strtou.c
index 2584dce..7e9acf0 100644
--- a/src/cll/strtou.c
+++ b/src/util/strtou.c
@@ -1,5 +1,5 @@
-// strtou.c, version 1.1.0
-// String conversion source file for OMKOV lib
+// util/strtou.c, version 1.1.1
+// String conversion source file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.