From ec1d16b307e1467391d5d314bf700cb151ca96f4 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Wed, 24 Oct 2018 14:28:22 +0200
Subject: [PATCH] Add a "pwd" utility to userland.

It's implemented as a separate process. How cute is that.
Tasks now have a current working directory. Spawned tasks inherit their
parent task's working directory.
Currently everyone just uses "/" as there's no way to chdir().
---
 AK/String.h                           |  10 +++++++--
 Kernel/Syscall.cpp                    |   2 ++
 Kernel/Syscall.h                      |   1 +
 Kernel/Task.cpp                       |  28 ++++++++++++++++++++++----
 Kernel/Task.h                         |   9 +++++++--
 Kernel/_fs_contents                   | Bin 1024000 -> 1024000 bytes
 Kernel/init.cpp                       |   2 +-
 Kernel/sync-sh                        |   1 +
 LibC/unistd.cpp                       |   8 ++++++++
 LibC/unistd.h                         |   4 +---
 Userland/.gitignore                   |   1 +
 Userland/Makefile                     |   9 +++++++--
 Userland/pwd.cpp                      |  15 ++++++++++++++
 VirtualFileSystem/FileHandle.cpp      |   3 +++
 VirtualFileSystem/FileHandle.h        |   2 ++
 VirtualFileSystem/InodeIdentifier.h   |   5 +++++
 VirtualFileSystem/VirtualFileSystem.h |   1 +
 17 files changed, 87 insertions(+), 14 deletions(-)
 create mode 100644 Userland/pwd.cpp

diff --git a/AK/String.h b/AK/String.h
index 4def06f2e6..96a193a331 100644
--- a/AK/String.h
+++ b/AK/String.h
@@ -76,9 +76,15 @@ public:
 
     String& operator=(String&& other)
     {
-        if (this != &other) {
+        if (this != &other)
             m_impl = move(other.m_impl);
-        }
+        return *this;
+    }
+
+    String& operator=(const String& other)
+    {
+        if (this != &other)
+            m_impl = const_cast<String&>(other).m_impl.copyRef();
         return *this;
     }
 
diff --git a/Kernel/Syscall.cpp b/Kernel/Syscall.cpp
index 846c1b99ea..538b635d15 100644
--- a/Kernel/Syscall.cpp
+++ b/Kernel/Syscall.cpp
@@ -70,6 +70,8 @@ DWORD handle(DWORD function, DWORD arg1, DWORD arg2, DWORD arg3)
         return current->sys$get_dir_entries((int)arg1, (void*)arg2, (size_t)arg3);
     case Syscall::PosixLstat:
         return current->sys$lstat((const char*)arg1, (void*)arg2);
+    case Syscall::PosixGetcwd:
+        return current->sys$getcwd((char*)arg1, (size_t)arg2);
     case Syscall::PosixOpen:
         //kprintf("syscall: open('%s', %u)\n", arg1, arg2);
         return current->sys$open((const char*)arg1, (size_t)arg2);
diff --git a/Kernel/Syscall.h b/Kernel/Syscall.h
index ff0b8af69e..bef6d5ff36 100644
--- a/Kernel/Syscall.h
+++ b/Kernel/Syscall.h
@@ -28,6 +28,7 @@ enum Function {
     PosixMunmap = 0x1996,
     GetDirEntries = 0x1997,
     PosixLstat = 0x1998,
+    PosixGetcwd = 0x1999,
 };
 
 void initialize();
diff --git a/Kernel/Task.cpp b/Kernel/Task.cpp
index 7005394ee5..50bc885708 100644
--- a/Kernel/Task.cpp
+++ b/Kernel/Task.cpp
@@ -165,13 +165,13 @@ int Task::sys$munmap(void* addr, size_t size)
 
 int Task::sys$spawn(const char* path)
 {
-    auto* child = Task::create(path, m_uid, m_gid);
+    auto* child = Task::create(path, m_uid, m_gid, m_pid);
     if (child)
         return child->pid();
     return -1;
 }
 
-Task* Task::create(const String& path, uid_t uid, gid_t gid)
+Task* Task::create(const String& path, uid_t uid, gid_t gid, pid_t parentPID)
 {
     auto parts = path.split('/');
     if (parts.isEmpty())
@@ -186,7 +186,7 @@ Task* Task::create(const String& path, uid_t uid, gid_t gid)
         return nullptr;
 
     InterruptDisabler disabler; // FIXME: Get rid of this, jesus christ. This "critical" section is HUGE.
-    Task* t = new Task(parts.takeLast(), uid, gid);
+    Task* t = new Task(parts.takeLast(), uid, gid, parentPID);
 
     ExecSpace space;
     space.hookableAlloc = [&] (const String& name, size_t size) {
@@ -222,18 +222,25 @@ Task* Task::create(const String& path, uid_t uid, gid_t gid)
     return t;
 }
 
-Task::Task(String&& name, uid_t uid, gid_t gid)
+Task::Task(String&& name, uid_t uid, gid_t gid, pid_t parentPID)
     : m_name(move(name))
     , m_pid(next_pid++)
     , m_uid(uid)
     , m_gid(gid)
     , m_state(Runnable)
     , m_ring(Ring3)
+    , m_parentPID(parentPID)
 {
     m_fileHandles.append(nullptr);
     m_fileHandles.append(nullptr);
     m_fileHandles.append(nullptr);
 
+    auto* parentTask = Task::fromPID(parentPID);
+    if (parentTask)
+        m_cwd = parentTask->m_cwd;
+    else
+        m_cwd = "/";
+
     m_nextRegion = LinearAddress(0x600000);
 
     memset(&m_tss, 0, sizeof(m_tss));
@@ -288,6 +295,8 @@ Task::Task(void (*e)(), const char* n, IPC::Handle h, RingLevel ring)
     m_fileHandles.append(nullptr);
     m_fileHandles.append(nullptr);
 
+    m_cwd = "/";
+
     m_nextRegion = LinearAddress(0x600000);
 
     Region* codeRegion = nullptr;
@@ -709,6 +718,17 @@ int Task::sys$lstat(const char* path, void* statbuf)
     return 0;
 }
 
+int Task::sys$getcwd(char* buffer, size_t size)
+{
+    if (size < m_cwd.length() + 1) {
+        // FIXME: return -ERANGE;
+        return -1;
+    }
+    memcpy(buffer, m_cwd.characters(), m_cwd.length());
+    buffer[m_cwd.length()] = '\0';
+    return 0;
+}
+
 int Task::sys$open(const char* path, size_t pathLength)
 {
     Task::checkSanity("sys$open");
diff --git a/Kernel/Task.h b/Kernel/Task.h
index c7ca13eeb4..9dc8de9c1b 100644
--- a/Kernel/Task.h
+++ b/Kernel/Task.h
@@ -16,8 +16,8 @@ class Zone;
 class Task : public InlineLinkedListNode<Task> {
     friend class InlineLinkedListNode<Task>;
 public:
-    static Task* create(const String& path, uid_t, gid_t);
-    Task(String&& name, uid_t, gid_t);
+    static Task* create(const String& path, uid_t, gid_t, pid_t parentPID);
+    Task(String&& name, uid_t, gid_t, pid_t parentPID);
 
     static Vector<Task*> allTasks();
 
@@ -103,6 +103,7 @@ public:
     void* sys$mmap(void*, size_t size);
     int sys$munmap(void*, size_t size);
     int sys$get_dir_entries(int fd, void*, size_t);
+    int sys$getcwd(char*, size_t);
 
     struct
     {
@@ -157,6 +158,8 @@ private:
     dword m_timesScheduled { 0 };
     pid_t m_waitee { -1 };
 
+    String m_cwd;
+
     struct Region {
         Region(LinearAddress, size_t, RetainPtr<Zone>&&, String&&);
         ~Region();
@@ -174,6 +177,8 @@ private:
 
     // FIXME: Implement some kind of ASLR?
     LinearAddress m_nextRegion;
+
+    pid_t m_parentPID { 0 };
 };
 
 extern void task_init();
diff --git a/Kernel/_fs_contents b/Kernel/_fs_contents
index 7aacb359bb12fc7d45c55342defaaa38d7d02b0e..fbf9da7dbd5ef29a9cb06874f60a9272d501ee38 100644
GIT binary patch
delta 5470
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
C$XvDn

delta 966
zcmZoTVApWKZUYYsYd<psL(pVF7HQ54As3>5g<OcX*=)+<%*Z6dx{<MsX%Ytyb3b#?
zW`2(E{EYk)87(I}NU*Sc`2U}OBBROX8i`J3ZhHne*eodXo_X_s`CdWETS^zAK^P*(
z#J~h$FtAU*=*uWPQ9x(%6GH{d1>y`0UDoHo_JZt&C}L#bfiM^t85kH;nHU(<m>3w;
znHU%}m>3u|nHU(fCL0>4PfjsfVERCqfuZE+Squ}nkWA2KVqnl=Vqnl^Vqnl?Vqnmp
zY-pgpImK9k$udWTfx+n+eg_yZF)$c1F)$c0F)$c2F))}gF))~d9q`0-f$bk@1_qEv
zLCyzZh`o#qd=LiM3ua6V4CYJ>3>Hib43<m`3|34G4Ax8x3^tPu4U{K8F_YQcVBVlH
zQJ`T{f<pn@5oRXFoZ^j)yO@_v;gFbKv4K&5amM7vf8x^@fSJ=bZeUbroH6|-h_aZ@
zxRFtvH9>%ZVcllNH{Q%mAKE@JwtZk~`@r1xfu-#OYug95wh!#fK5(#Xzv#~4!94wM
z9HY(lIl`P$Oxx#`GBznKSIA-1VHBCJn80DjSUEi*fkRT<mx+O)yLHdM|Nm7PJ}@xY
zGB_|W@VBm<J|ThQ8Kd#^@<a~R=^JixC=1Q`_y2!J1Oo%Zi$DMW|3A*65<C5IB8NI-
z@O17Z4pp}3fB*jn22QuT#i3E}{qO&OTZRM%hEm?<H#`|e3=9k}&B0;{FfkL5m@-&Q
z048Pz65|JpHNeCyKw`iD{{Ig$$O^=H2jV<nZ2rM0d7$~h*5(5hK|ui-{vfGc|Nj3s
zJkY!S=`D_E4sO*71qBAxV%1~@uI+*Gj4v6t>*aDtF)=RM?wQXqpRs-dBLf4Y7z4vp
zMg|5ZO$LTJQ2s(Fe?5rSV_-NA6~7GPn=&vw0MUjF44<Il-$8s$1_og!h<Tvo3o;iJ
z?;zSADxM6b3m`N*LpPYQ{oFD}IhOW{SkCr}Sg!VpSnl?USf2KZSl;%ESibEQvHTrQ
E0PK7UAOHXW

diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index e67e92329a..99bca8f15b 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -150,7 +150,7 @@ static void init_stage2()
     }
 #endif
 
-    auto* shTask = Task::create("/bin/sh", (uid_t)100, (gid_t)100);
+    auto* shTask = Task::create("/bin/sh", (uid_t)100, (gid_t)100, (pid_t)0);
 
     banner();
 
diff --git a/Kernel/sync-sh b/Kernel/sync-sh
index a0f071bd68..e2d1e6cd2a 100755
--- a/Kernel/sync-sh
+++ b/Kernel/sync-sh
@@ -4,5 +4,6 @@ cp ../Userland/sh mnt/bin/sh
 cp ../Userland/id mnt/bin/id
 cp ../Userland/ps mnt/bin/ps
 cp ../Userland/ls mnt/bin/ls
+cp ../Userland/pwd mnt/bin/pwd
 umount mnt
 sync
diff --git a/LibC/unistd.cpp b/LibC/unistd.cpp
index 42e3f49c32..f0c5831940 100644
--- a/LibC/unistd.cpp
+++ b/LibC/unistd.cpp
@@ -45,5 +45,13 @@ int lstat(const char* path, stat* statbuf)
     return Syscall::invoke(Syscall::PosixLstat, (dword)path, (dword)statbuf);
 }
 
+char* getcwd(char* buffer, size_t size)
+{
+    int rc = Syscall::invoke(Syscall::PosixGetcwd, (dword)buffer, (dword)size);
+    if (rc != 0)
+        return nullptr;
+    return buffer;
+}
+
 }
 
diff --git a/LibC/unistd.h b/LibC/unistd.h
index 7dcbe0b51f..96603a6795 100644
--- a/LibC/unistd.h
+++ b/LibC/unistd.h
@@ -11,7 +11,7 @@ int open(const char* path);
 ssize_t read(int fd, void* buf, size_t count);
 int close(int fd);
 pid_t waitpid(pid_t);
-
+char* getcwd(char* buffer, size_t size);
 int lstat(const char* path, stat* statbuf);
 
 #define	S_IFMT 0170000
@@ -36,7 +36,6 @@ int lstat(const char* path, stat* statbuf);
 #define S_IWOTH 0002
 #define S_IXOTH 0001
 
-
 #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
 #define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
@@ -45,4 +44,3 @@ int lstat(const char* path, stat* statbuf);
 #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
 
 }
-
diff --git a/Userland/.gitignore b/Userland/.gitignore
index 5f641bf9a1..ed1a6797f5 100644
--- a/Userland/.gitignore
+++ b/Userland/.gitignore
@@ -2,4 +2,5 @@ id
 sh
 ps
 ls
+pwd
 *.o
diff --git a/Userland/Makefile b/Userland/Makefile
index c1cd22033c..e47a8578b6 100644
--- a/Userland/Makefile
+++ b/Userland/Makefile
@@ -2,13 +2,15 @@ OBJS = \
        id.o \
        sh.o \
        ps.o \
-       ls.o
+       ls.o \
+       pwd.o
 
 APPS = \
        id \
        sh \
        ps \
-       ls
+       ls \
+       pwd
 
 ARCH_FLAGS =
 STANDARD_FLAGS = -std=c++17 -nostdinc++ -nostdlib
@@ -40,6 +42,9 @@ ps: ps.o
 ls: ls.o
 	$(LD) -o $@ $(LDFLAGS) $< ../LibC/LibC.a
 
+pwd: pwd.o
+	$(LD) -o $@ $(LDFLAGS) $< ../LibC/LibC.a
+
 .cpp.o:
 	@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
 
diff --git a/Userland/pwd.cpp b/Userland/pwd.cpp
new file mode 100644
index 0000000000..ebb7d5b6d3
--- /dev/null
+++ b/Userland/pwd.cpp
@@ -0,0 +1,15 @@
+#include <LibC/unistd.h>
+#include <LibC/stdio.h>
+
+int main(int c, char** v)
+{
+    char buffer[1024];
+    char* ptr = getcwd(buffer, sizeof(buffer));
+    if (!ptr) {
+        printf("getcwd() failed\n");
+        return 1;
+    }
+    printf("%s\n", ptr);
+    return 0;
+}
+
diff --git a/VirtualFileSystem/FileHandle.cpp b/VirtualFileSystem/FileHandle.cpp
index 90c0beade2..172fe74cf5 100644
--- a/VirtualFileSystem/FileHandle.cpp
+++ b/VirtualFileSystem/FileHandle.cpp
@@ -142,6 +142,9 @@ ssize_t FileHandle::get_dir_entries(byte* buffer, size_t size)
         return true;
     });
 
+    if (size < stream.offset())
+        return -1;
+
     memcpy(buffer, tempBuffer.pointer(), stream.offset());
     return stream.offset();
 }
diff --git a/VirtualFileSystem/FileHandle.h b/VirtualFileSystem/FileHandle.h
index f75d88895c..0aa23b93dd 100644
--- a/VirtualFileSystem/FileHandle.h
+++ b/VirtualFileSystem/FileHandle.h
@@ -16,6 +16,8 @@ public:
 
     ByteBuffer readEntireFile();
 
+    String absolutePath() const;
+
 #ifdef SERENITY
     int fd() const { return m_fd; }
     void setFD(int fd) { m_fd = fd; }
diff --git a/VirtualFileSystem/InodeIdentifier.h b/VirtualFileSystem/InodeIdentifier.h
index 865b07f838..d985266ec6 100644
--- a/VirtualFileSystem/InodeIdentifier.h
+++ b/VirtualFileSystem/InodeIdentifier.h
@@ -28,6 +28,11 @@ public:
         return m_fileSystemID == other.m_fileSystemID && m_index == other.m_index;
     }
 
+    bool operator!=(const InodeIdentifier& other) const
+    {
+        return m_fileSystemID != other.m_fileSystemID || m_index != other.m_index;
+    }
+
     InodeMetadata metadata() const;
     bool isRootInode() const;
 
diff --git a/VirtualFileSystem/VirtualFileSystem.h b/VirtualFileSystem/VirtualFileSystem.h
index bafb791d9f..53e8fcb4a1 100644
--- a/VirtualFileSystem/VirtualFileSystem.h
+++ b/VirtualFileSystem/VirtualFileSystem.h
@@ -78,6 +78,7 @@ private:
     friend class FileHandle;
 
     void enumerateDirectoryInode(InodeIdentifier, Function<bool(const FileSystem::DirectoryEntry&)>);
+    String absolutePath(InodeIdentifier);
     InodeIdentifier resolvePath(const String& path);
     InodeIdentifier resolveSymbolicLink(const String& basePath, InodeIdentifier symlinkInode);