ls.cc

e899cb3b · Nickolai Zeldovich · 386b6539 · e899cb3b · e899cb3b · e899cb3b
--- a/ls.c
+++ b/ls.c
+extern "C" {
 #include "types.h"
 #include "stat.h"
 #include "user.h"
 #include "fs.h"
+}

-char*
-fmtname(char *path)
+const char*
+fmtname(const char *path)
 {
  static char buf[DIRSIZ+1];
-  char *p;
+  const char *p;
  
  // Find first character after last slash.
  for(p=path+strlen(path); p >= path && *p != '/'; p--)
@@ -23,7 +25,7 @@ fmtname(char *path)
 }

 void
-ls(char *path)
+ls(const char *path)
 {
  char buf[512], *p;
  int fd;

--- a/printf.c
+++ b/printf.c
@@ -101,7 +101,7 @@ writec(void *arg, char c)
 }

 void
-printf(int fd, char *fmt, ...)
+printf(int fd, const char *fmt, ...)
 {
  va_list ap;


--- a/ulib.c
+++ b/ulib.c
@@ -15,7 +15,7 @@ strncpy(char *s, const char *t, int n)
 }

 char*
-strcpy(char *s, char *t)
+strcpy(char *s, const char *t)
 {
  char *os;


--- a/user.h
+++ b/user.h
@@ -28,7 +28,7 @@ void halt(void);

 // ulib.c
 int stat(char*, struct stat*);
-char* strcpy(char*, char*);
+char* strcpy(char*, const char*);
 void *memmove(void*, const void*, int);
 char* strchr(const char*, char c);
 int strcmp(const char*, const char*);
@@ -45,6 +45,6 @@ int atoi(const char*);
 int forkt(void *sp, void *pc, void *arg);

 // printf.c
-void printf(int, char*, ...);
+void printf(int, const char*, ...);
 void snprintf(char *buf, unsigned int n, const char *fmt, ...);
 void die(const char* errstr, ...) __attribute__((noreturn));