Revamped files a bit, removed a bunch of disk images, and fixed the r…

…emoval bug.
AWOLASAP · Aug 7, 2020 · e8f13f1 · e8f13f1
1 parent 6526a23
commit e8f13f1
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 8 deletions.
diff --git a/os/os.dsk b/os/os.dsk
diff --git a/os/os.img b/os/os.img
diff --git a/os/os.qcow2 b/os/os.qcow2
diff --git a/os/os.tar b/os/os.tar
diff --git a/os/os.tar.orig → os/os.tar.1 b/os/os.tar.orig → os/os.tar.1
diff --git a/os/os.tar.backup b/os/os.tar.backup
diff --git a/os/os.tar.orig1 b/os/os.tar.orig1
diff --git a/os/osb.img b/os/osb.img
diff --git a/os/src/ustar.rs b/os/src/ustar.rs
@@ -562,10 +562,6 @@ impl USTARItem for Directory {
 
     fn set_name(&mut self, name: String) {
         self.name = name.clone();
-        self.name.reserve_exact(100 - self.name.len());
-        while self.name.len() < 100 {
-            self.name.push('\0');
-        }
     }
 
     fn get_name_and_prefix(&self) -> String {
@@ -963,10 +959,6 @@ impl USTARItem for File {
 
     fn set_name(&mut self, name: String) {
         self.name = name.clone();
-        self.name.reserve_exact(100 - self.name.len());
-        while self.name.len() < 100 {
-            self.name.push('\0');
-        }
     }
 
     fn get_name_and_prefix(&self) -> String {
@@ -1152,6 +1144,15 @@ impl USTARFileSystem {
             self.block_used_ptr = counter as u64;
             // Somehow sort the thing
         }
+        for f in self.files.iter() {
+            if !self.is_absolute(&f.lock().get_name()) {
+                let mut strng = String::from("/");
+                strng.push_str(&f.lock().get_name());
+                f.lock().set_name(strng);
+                f.lock().should_write();
+            }
+        }
+        self.write();
     }
 
     #[allow(clippy::all)]
@@ -1640,6 +1641,7 @@ impl USTARFileSystem {
     // Removes a file if it exists, does nothing if it doesn't
     pub fn remove_file(&mut self, file: String, id: Option<u64>) {
         if let Some(file) =  self.resolve_file(file, id) {
+            println!("{}",  file.lock().name);
             let (first, _) = self.split_last_and_first(file.lock().name.to_string());
             if let Some(directory) = self.resolve_directory( first, id) {
                 file.lock().name = "defrag".to_string();