From 179c9e125dc453d760a8fcf37877377d400dc628 Mon Sep 17 00:00:00 2001
From: Om Raheja <omr@rslp.org>
Date: Thu, 29 Aug 2024 11:57:27 -0400
Subject: [PATCH] made it work for the most part

---
 rank.h         |   7 ++++---
 weightedrank   | Bin 51040 -> 51104 bytes
 weightedrank.c |  27 +++++++++++++--------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/rank.h b/rank.h
index a90ae84..68df01c 100644
--- a/rank.h
+++ b/rank.h
@@ -13,14 +13,14 @@ struct Rank
 struct RankList
 {
     int         rank_count;
-    struct Rank rank[M_STR];
+    char        rank[M_STR][M_STR_LEN];
     struct Rank srank[M_STR];
 };
 
 struct WRankList
 {
     int             rank_count;
-    struct Rank     rank[M_STR];
+    char            rank[M_STR][M_STR_LEN];
     struct Rank     srank[3][M_STR];
 };
 
@@ -46,6 +46,7 @@ void isort(char [][M_STR], struct Rank[], int);
 void rank(struct Rank *, int);
 void print_ranklist(struct RankList *);
 
-int  rrlstdin(struct Rank[]);
+/* read string from stdin */
+int  rsstdin(char [][M_STR_LEN]);
 
 #endif
diff --git a/weightedrank b/weightedrank
index 6327a5b3290fa202627623e5213d28cb07b27183..35129c272b1f5efb9d473499d25d7771e616fdc2 100755
GIT binary patch
delta 2688
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
SH*fv+@Xhdoh1*48#PdH-Tr<D`

delta 2620
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
Z_v6YTXExp25_`EV{ps$E`>H}E!ap}e4S4_n

diff --git a/weightedrank.c b/weightedrank.c
index 635730c..597358d 100644
--- a/weightedrank.c
+++ b/weightedrank.c
@@ -58,7 +58,8 @@ main(int argc, char *argv[])
         }
     }
 
-    items->rank_count = rrlstdin(items->rank);
+    items->rank_count = rsstdin(items->rank);
+    memcpy(items->srank, items->rank, sizeof(struct Rank) * items->rank_count);
     rank(items->srank, items->rank_count);
 
     if (!weighted) {
@@ -153,31 +154,29 @@ isort(char matrix[][M_STR], struct Rank to_sort[], int len) {
 } 
 
 int
-rrlstdin(struct Rank items[]) 
+rsstdin(char items[M_STR][M_STR_LEN]) 
 {
-    printf(BOLDWHITE "Enter items...\n" RESET);
+    puts(BOLDWHITE "Enter items..." RESET);
     int i;
     for (i = 0; i < M_STR; i++) {
         // local buffer for name
-        char *name = items[i].name;
-
-        puts(BOLDGREEN "> " RESET);
-        fgets(name, M_STR_LEN, stdin);
+        printf(BOLDGREEN "> " RESET);
+        fgets(items[i], M_STR_LEN, stdin);
 
         // if its an empty string, stop reading
-        if (name[0] == '\n') {
-            name[0] = '\0';
+        if (items[i][0] == '\n') {
+            items[i][0] = '\0';
             break;
         } 
 
         // remove newline
-        char nl = strcspn(name, "\n");
-        if (nl != '\n' || nl != 0) {
+        char nl = strcspn(items[i], "\n");
+        if (items[i][nl] != '\n' && items[i][nl] != 0) {
             // it was cut off
             puts(BOLDRED "Truncated to 255 chars." RESET);
-            name[nl] = '\0';
+            items[i][nl] = '\0';
         } 
-        name[nl] = '\0';
+        items[i][nl] = '\0';
     }
     
     return i;
@@ -232,7 +231,7 @@ print_ranklist(struct RankList *items) {
     printf(BOLDRED "Original: " RESET " | " BOLDGREEN "Sorted: " RESET "\n\n");
     for (int j = 0; j < items->rank_count; j++) {
         printf("%s: %d | %s: %d\n", 
-                items->rank[j].name, items->rank[j].score, 
+                items->rank[j], items->rank_count - j - 1, 
                 items->srank[j].name, items->srank[j].score);
     }
 }