From b6b666e1bc919a00e585db873adfa87e266da0e6 Mon Sep 17 00:00:00 2001 From: Mohamed El-Zeneiny Date: Mon, 30 Jan 2023 15:39:21 -0500 Subject: [PATCH] bonus files --- c/job.c | 3 +++ c/main.c | 9 +++++++++ java/src/main/java/ca/uwaterloo/cs489/exercise2/Job.java | 4 ++++ .../main/java/ca/uwaterloo/cs489/exercise2/MainApp.java | 7 +++++++ 4 files changed, 23 insertions(+) diff --git a/c/job.c b/c/job.c index b89b804..6531db6 100644 --- a/c/job.c +++ b/c/job.c @@ -30,6 +30,9 @@ int create_job(const char *dir) { cleanup: fclose(jobfile); + + remove(jobfname); + printf("Deleted %s\n",jobfname); free(jobfname); jobfname = NULL; diff --git a/c/main.c b/c/main.c index 258cf47..77cdb21 100644 --- a/c/main.c +++ b/c/main.c @@ -23,6 +23,15 @@ int main(int argc, const char *argv[]) { } cleanup: + printf("cleaning up!\n"); + char cmd[128] = {0}; + snprintf(cmd, 128, "rmdir %s", dir); + int ret = system(cmd); + if (ret==0){ + printf("removed directory \"%s\" successfully\n", dir); + } else { + printf("error removing directory \"%s\"\n", dir); + } free(dir); dir = NULL; diff --git a/java/src/main/java/ca/uwaterloo/cs489/exercise2/Job.java b/java/src/main/java/ca/uwaterloo/cs489/exercise2/Job.java index e3167e4..4a895e4 100644 --- a/java/src/main/java/ca/uwaterloo/cs489/exercise2/Job.java +++ b/java/src/main/java/ca/uwaterloo/cs489/exercise2/Job.java @@ -32,4 +32,8 @@ public int processJob() { } public int getInput() { return this.input; } + + public void deleteFile() { + file.delete(); + } } diff --git a/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java b/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java index c699133..562c36b 100644 --- a/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java +++ b/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java @@ -1,6 +1,7 @@ package ca.uwaterloo.cs489.exercise2; import java.io.BufferedReader; +import java.io.File; import java.io.InputStreamReader; import java.io.IOException; import java.io.FileNotFoundException; @@ -35,7 +36,13 @@ public static void main(String[] args) { for (Path entry : ds) { Job job = new Job(entry.toFile()); logger.info(String.format("Job %d yields %d\n", job.getInput(), job.processJob())); + job.deleteFile(); + logger.info("Deleted file for Job %d\n",job.getInput()); } + File dirFile = dir.toFile(); + dirFile.delete(); + logger.info("Deleted directory \"%s\"\n",dir.toString()); + } catch (IOException e) { e.printStackTrace(); }