[cadcdev-svn-commits] [SCM] branch master updated. 86bc85d765b6a288e8c6f35c3442801da1b164b8

[Allura u. <al...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, master has been updated
       via  86bc85d765b6a288e8c6f35c3442801da1b164b8 (commit)
      from  517ac0bde64de887ca0ff9b4de0c92b79b11b665 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 86bc85d765b6a288e8c6f35c3442801da1b164b8
Author: darc <da...@pr...>
Date:   Sat Jun 3 22:45:20 2023 -0500

    Fix libkosh building after MAX_FN_LEN -> NAME_MAX change in KOS

-----------------------------------------------------------------------

Summary of changes:
 builtin.c | 40 ++++++++++++++++++++--------------------
 chdir.c   |  8 ++++----
 input.c   |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/builtin.c b/builtin.c
index 2732f6f..21dc6df 100644
--- a/builtin.c
+++ b/builtin.c
@@ -58,7 +58,7 @@ static void builtin_exit(int argc, char *argv[]) {
 static void builtin_ls(int argc, char *argv[]) {
 	dirent_t *ent;
 	uint32 hnd;
-	char dir[MAX_FN_LEN];
+	char dir[NAME_MAX];
 	int lflag;
 
 	lflag = 0;
@@ -68,7 +68,7 @@ static void builtin_ls(int argc, char *argv[]) {
 			lflag = 1;
 	}
 
-	getcwd(dir, MAX_FN_LEN);
+	getcwd(dir, NAME_MAX);
 
 	conio_printf("Reading %s\n", dir);
 
@@ -100,9 +100,9 @@ static void builtin_cd(int argc, char *argv[]) {
 
 /* print the current directory */
 static void builtin_pwd(int argc, char *argv[]) {
-	char buff[MAX_FN_LEN];
+	char buff[NAME_MAX];
 
-	conio_printf("%s\n", getcwd(buff, MAX_FN_LEN));
+	conio_printf("%s\n", getcwd(buff, NAME_MAX));
 }
 
 /* clear the screen */
@@ -124,7 +124,7 @@ static void builtin_echo(int argc, char *argv[]) {
 static void builtin_cat(int argc, char *argv[]) {
 	uint32 hnd;
 	char buff[256];
-	char fn[MAX_FN_LEN];
+	char fn[NAME_MAX];
 	int cnt;
 
 	if (argc != 2) {
@@ -133,7 +133,7 @@ static void builtin_cat(int argc, char *argv[]) {
 	}
 
 	/* the the abs path */
-	makeabspath(fn, argv[1], MAX_FN_LEN);
+	makeabspath(fn, argv[1], NAME_MAX);
 
 	hnd = fs_open(fn, O_RDONLY);
 	if (!hnd) {
@@ -161,7 +161,7 @@ static void builtin_cat(int argc, char *argv[]) {
 
 /* dump files as hex */
 static void builtin_hd(int argc, char *argv[]) {
-	char fn[MAX_FN_LEN];
+	char fn[NAME_MAX];
 	char buff[10];
 	uint32 hnd;
 	int cnt;
@@ -171,7 +171,7 @@ static void builtin_hd(int argc, char *argv[]) {
 		return;
 	}
 
-	makeabspath(fn, argv[1], MAX_FN_LEN);
+	makeabspath(fn, argv[1], NAME_MAX);
 
 	hnd = fs_open(fn, O_RDONLY);
 	if (!hnd) {
@@ -203,8 +203,8 @@ static void builtin_hd(int argc, char *argv[]) {
 /* copy files */
 static void builtin_cp(int argc, char *argv[]) {
 	char buff[256];
-	char srcfn[MAX_FN_LEN];
-	char destfn[MAX_FN_LEN];
+	char srcfn[NAME_MAX];
+	char destfn[NAME_MAX];
 	uint32 src;
 	uint32 dest;
 	int cnt;
@@ -215,8 +215,8 @@ static void builtin_cp(int argc, char *argv[]) {
 	}
 
 	/* get abs paths */
-	makeabspath(srcfn, argv[1], MAX_FN_LEN);
-	makeabspath(destfn, argv[2], MAX_FN_LEN);
+	makeabspath(srcfn, argv[1], NAME_MAX);
+	makeabspath(destfn, argv[2], NAME_MAX);
 
 	src = fs_open(srcfn, O_RDONLY);
 	if (!src) { conio_printf("Error opening %s\n", srcfn); return; }
@@ -233,7 +233,7 @@ static void builtin_cp(int argc, char *argv[]) {
 
 /* unlink files */
 static void builtin_rm(int argc, char *argv[]) {
-	char fn[MAX_FN_LEN];
+	char fn[NAME_MAX];
 
 	if (argc != 2) {
 		conio_printf("usage: rm file\n");
@@ -241,7 +241,7 @@ static void builtin_rm(int argc, char *argv[]) {
 	}
 
 	/* get the abs path for the fn to rem */
-	makeabspath(fn, argv[1], MAX_FN_LEN);
+	makeabspath(fn, argv[1], NAME_MAX);
 
 	if (fs_unlink(fn) != 0)
 		conio_printf("Error unlinking %s.\n", fn);
@@ -249,7 +249,7 @@ static void builtin_rm(int argc, char *argv[]) {
 
 /* create a directory */
 static void builtin_mkdir(int argc, char *argv[]) {
-	char fn[MAX_FN_LEN];
+	char fn[NAME_MAX];
 	
 	if (argc != 2) {
 		conio_printf("usage: mkdir dirname\n");
@@ -257,7 +257,7 @@ static void builtin_mkdir(int argc, char *argv[]) {
 	}
 
 	/* get the abs path for the dir to create */
-	makeabspath(fn, argv[1], MAX_FN_LEN);
+	makeabspath(fn, argv[1], NAME_MAX);
 
 	if (fs_mkdir(fn) != 0)
 		conio_printf("Error making directory %s.\n", fn);
@@ -265,7 +265,7 @@ static void builtin_mkdir(int argc, char *argv[]) {
 
 /* delete a directory */
 static void builtin_rmdir(int argc, char *argv[]) {
-	char fn[MAX_FN_LEN];
+	char fn[NAME_MAX];
 	
 	if (argc != 2) {
 		conio_printf("usage: rmdir dirname\n");
@@ -273,7 +273,7 @@ static void builtin_rmdir(int argc, char *argv[]) {
 	}
 
 	/* get the abs path for the dir to delete */
-	makeabspath(fn, argv[1], MAX_FN_LEN);
+	makeabspath(fn, argv[1], NAME_MAX);
 
 	if (fs_rmdir(fn) != 0)
 		conio_printf("Error deleting directory %s.\n", fn);
@@ -363,7 +363,7 @@ static void builtin_die(int argc, char *argv[]) {
 #ifdef _arch_dreamcast
 /* Do a screen dump -- note, won't always work 100% due to threading stuff */
 static void builtin_sshot(int argc, char *argv[]) {
-	char fn[MAX_FN_LEN];
+	char fn[NAME_MAX];
 
 	if (argc != 2) {
 		conio_printf("usage: sshot outfile.ppm\n");
@@ -371,7 +371,7 @@ static void builtin_sshot(int argc, char *argv[]) {
 	}
 	
 	/* get the abs path for the dir to create */
-	makeabspath(fn, argv[1], MAX_FN_LEN);
+	makeabspath(fn, argv[1], NAME_MAX);
 
 	conio_printf("Doing a screen shot to %s\n", fn);
 	vid_screen_shot(fn);
diff --git a/chdir.c b/chdir.c
index 51595b0..2f6c14a 100644
--- a/chdir.c
+++ b/chdir.c
@@ -9,7 +9,7 @@
 #include "kosh.h"
 
 /* the current directory */
-static char cwd[MAX_FN_LEN];
+static char cwd[NAME_MAX];
 
 /* read a pathname based on the current directory and turn it into an abs one, we
    don't check for validity, or really do anything except handle ..'s and .'s */
@@ -62,10 +62,10 @@ int makeabspath(char *buff, char *path, size_t size) {
 
 /* change the current directory (dir is an absolute path for now) */
 int kosh_chdir(char *dir) {
-	char buff[MAX_FN_LEN];
+	char buff[NAME_MAX];
 
-	makeabspath(buff, dir, MAX_FN_LEN);
-	strncpy(cwd, buff, MAX_FN_LEN);
+	makeabspath(buff, dir, NAME_MAX);
+	strncpy(cwd, buff, NAME_MAX);
 
 	fs_chdir(cwd);
 
diff --git a/input.c b/input.c
index 1606983..1088490 100644
--- a/input.c
+++ b/input.c
@@ -36,7 +36,7 @@ void input_oneloop() {
 
 	/* try to run the command as a builtin */
 	if (!kosh_builtin_command(argc, argv)) {
-		/* makeabspath(buff, argv[0], MAX_FN_LEN); */
+		/* makeabspath(buff, argv[0], NAME_MAX); */
 
 		/* the builtin failed so we try an external */
 		/* if (process->load_and_exec(buff, argc, argv))


hooks/post-receive
-- 
UNNAMED PROJECT