From b590c9d28d2266cd0848e515019cf9fc95b7fd26 Mon Sep 17 00:00:00 2001 From: Huck Boles Date: Thu, 17 Nov 2022 00:00:10 -0600 Subject: [PATCH] Thu Nov 17 12:00:10 AM CST 2022 automatic backup --- .../@usr@include@bits@types.h.blob | Bin 9850 -> 9852 bytes .../@usr@include@bits@wordsize.h.blob | Bin 2620 -> 2622 bytes .../@usr@include@features-time64.h.blob | Bin 2437 -> 2439 bytes .../@usr@include@gnu@stubs.h.blob | Bin 2416 -> 2418 bytes .../@usr@include@stdc-predef.h.blob | Bin 2898 -> 2900 bytes .../@usr@include@stdio.h.blob | Bin 37510 -> 37510 bytes .ccls-cache/@home@huck@.repos@odot/file.c | 106 ++++++++++-------- .../@home@huck@.repos@odot/file.c.blob | Bin 7061 -> 7499 bytes .ccls-cache/@home@huck@.repos@odot/input.c | 52 +++++---- .../@home@huck@.repos@odot/input.c.blob | Bin 5689 -> 6005 bytes .ccls-cache/@home@huck@.repos@odot/main.c | 36 +++--- .../@home@huck@.repos@odot/main.c.blob | Bin 6168 -> 6049 bytes .ccls-cache/@home@huck@.repos@odot/odot.h | 5 +- .../@home@huck@.repos@odot/odot.h.blob | Bin 5207 -> 5107 bytes file.c | 106 ++++++++++-------- input.c | 52 +++++---- main.c | 36 +++--- odot | Bin 22016 -> 21936 bytes odot.h | 5 +- 19 files changed, 218 insertions(+), 180 deletions(-) diff --git a/.ccls-cache/@@home@huck@.repos@odot/@usr@include@bits@types.h.blob b/.ccls-cache/@@home@huck@.repos@odot/@usr@include@bits@types.h.blob index 2a97e0c6792c103efdf1f87b945606b64d653ae7..80141a71c38a5ac527e7ba2689579a018c30bf41 100644 GIT binary patch delta 47 zcmez6^T%g`1Ak^-L1~FzG6QpRPGVj0Jhr_ A3;+NC delta 46 zcmez4^UG&~17BKZPO4rq19NgtVqQAK#71!zkjTdDcvj|BkDgBsWR}|eoOP-K0HR3| Az5oCK diff --git a/.ccls-cache/@@home@huck@.repos@odot/@usr@include@bits@wordsize.h.blob b/.ccls-cache/@@home@huck@.repos@odot/@usr@include@bits@wordsize.h.blob index bcbe4f3367d2fda0145507cf6a1fd70a8a8bbc5c..fc978a6ffba553e6d8cd73dccb85aec159536310 100644 GIT binary patch delta 48 zcmdlZvQK1!B7bIHL1~FzG6QpRPGVj*!X5K_K2))rKo|ReY`SZySnItzKXDw#|0P$cATL1t6 diff --git a/.ccls-cache/@@home@huck@.repos@odot/@usr@include@features-time64.h.blob b/.ccls-cache/@@home@huck@.repos@odot/@usr@include@features-time64.h.blob index a2c8cf881cc6f6466ed35de0cf5b2dfdc2c6414f..5a61925eef691a41d868392af862afe47faf49e0 100644 GIT binary patch delta 48 zcmZn_ZWo@Q$e)>4P+Fpw%)p$SlbDyzFfl=#6)d#TE1s2^FZk8uMiz<9M_3Os0|0wJ B5EcLc delta 36 ocmZn{ZWW%O$da3wnKw}lLT~hmXJuaX==tP_Op=?AvmRgu0O-sOwg3PC diff --git a/.ccls-cache/@@home@huck@.repos@odot/@usr@include@gnu@stubs.h.blob b/.ccls-cache/@@home@huck@.repos@odot/@usr@include@gnu@stubs.h.blob index 4d6b49e87d49560491e687f7cbaa7f8e8f93f3db..1cd7b8dc2d8a11f0e1bafa2e7c13a44e358c5694 100644 GIT binary patch delta 48 zcmew$^hs!fB7bIHL1~FzG6QpRPGVj9kPU=K82))rKo|Spkqvw+!GD&Ve&bpcz00hqtYXATM diff --git a/.ccls-cache/@@home@huck@.repos@odot/@usr@include@stdc-predef.h.blob b/.ccls-cache/@@home@huck@.repos@odot/@usr@include@stdc-predef.h.blob index b299ad6e50dc1d73c1c58b74cc2802a9f93ef4e6..bddb0b58385fc8eba96598c0c09953af190a984a 100644 GIT binary patch delta 48 zcmca4c13K0B7bIHL1~FzG6QpRPGVj*!X5K_K2))rKo|ReY`SZySnItzKXYFML0QeaVq5uE@ diff --git a/.ccls-cache/@@home@huck@.repos@odot/@usr@include@stdio.h.blob b/.ccls-cache/@@home@huck@.repos@odot/@usr@include@stdio.h.blob index d8ef87d5de8516970f34ab151b000c0a51f9af2f..88a88c1a441eccff981a03b978237cd27d8cde8e 100644 GIT binary patch delta 22 ecmZo$%G9=$X~TY2X1?H8lLeWiHs4`g)dK)xF9@dq delta 22 ecmZo$%G9=$X~TY2W~JxPCkrx3ZN9_0ss{jRT?tG8 diff --git a/.ccls-cache/@home@huck@.repos@odot/file.c b/.ccls-cache/@home@huck@.repos@odot/file.c index 2d5b277..4fbcfb9 100644 --- a/.ccls-cache/@home@huck@.repos@odot/file.c +++ b/.ccls-cache/@home@huck@.repos@odot/file.c @@ -1,63 +1,71 @@ #include "odot.h" void add(struct task t, FILE *fp){ - printf("\nalloc\n"); - char *c = malloc(strlen(t.task)*sizeof(char)); - printf("\nfopen\n"); - FILE *buf = fopen("odot.tmp", "w"); + printf("\talloc\n"); + char *line = malloc(MAXLINE*sizeof(char)); + printf("\tfopen\n"); + FILE *buf = fopen("/home/huck/.local/state/odot/odot.txt", "w+"); int i = 0; - printf("\nloopstart\n"); - int j = 0; - while (fgets(c,strlen(t.task),fp) != NULL){ - printf("\n%i-nloop\n", j++); - switch (listcheck(t,fp)){ - case 3: - dialogue("Already on todo list", t.task, CYAN); - printf("Remove from list?"); - if (check() == 0){ + printf("\tNULLcheck\n"); + if (fgets(line,MAXLINE,fp) == NULL){ + puttask(t,buf); + } else { + printf("\tloopstart\n"); + int j = 0; + while (fgets(line,MAXLINE,fp) != NULL){ + printf("\t%i-nloop\n", ++j); + switch (listcheck(t,line)){ + case 3: + dialogue("Already on todo list", t.task, CYAN); + printf("Remove from list?"); + if (check() == 0){ + break; + } else { + puttask(gettask(line), buf); + break; + } + case 1: + dialogue("Already on list in a different group", gettask(line).group, YELLOW); + if (check() == 0){ + puttask(t,buf); + i++; + } + puttask(gettask(line), buf); break; - } else { - puttask(gettask(fp), buf); + default: + /* first time t.task is lexigraphically greater than a previous task */ + if (i == 0 && strcmp(line,t.task) > 0){ + puttask(t,buf); + ++i; + } + puttask(gettask(line), buf); break; - } - case 1: - dialogue("Already on list in a different group", gettask(fp).group, YELLOW); - if (check() == 0){ - puttask(t,buf); - i++; - } - puttask(gettask(fp), buf); - break; - default: - /* first time t.task is lexigraphically greater than a previous task */ - if (i == 0 && strcmp(c,t.task) > 0){ - puttask(t,buf); - ++i; - } - puttask(gettask(fp), buf); - break; + } } } - free(c); fclose(fp); fclose(buf); - remove("/home/huck/.local/state/odot/todo"); - rename("odot.tmp", "/home/huck/.local/state/odot/todo"); + remove("/home/huck/.local/state/odot/todo.txt"); + rename("/home/huck/.local/state/odot/odot.txt", "/home/huck/.local/state/odot/todo.txt"); + free(line); + fp = fopen("/home/huck/.local/state/odot/todo.txt", "w+"); + if (!fp) + error(1); return; } void rem(struct task t, FILE *fp){ char *s = malloc(MAXLINE * sizeof(char)); - FILE *buf = fopen("odot.tmp", "w"); + FILE *buf = fopen("/home/huck/.local/state/odot/odot.txt", "w+"); int i = 0; while (fgets(s, MAXLINE, fp) != NULL){ s[strlen(s) - 1] = 0; if (strcmp(t.task, s) != 0){ - fputs(strcat(s,"\n"),buf); + fputs(strcat(s,"\t"),buf); } else { i++; } @@ -66,8 +74,10 @@ void rem(struct task t, FILE *fp){ fclose(fp); fclose(buf); - remove ("/home/huck/.local/state/odot/todo"); - rename("odot.tmp", "/home/huck/.local/state/odot/todo"); + remove ("/home/huck/.local/state/odot/todo.txt"); + rename("/home/huck/.local/state/odot/odot.txt", "/home/huck/.local/state/odot/todo.txt"); + + fp = fopen("/home/huck/.local/state/odot/todo.txt", "w+"); if (i == 0){ dialogue("Task not found", t.task, YELLOW); @@ -76,18 +86,24 @@ void rem(struct task t, FILE *fp){ add(t,fp); } } - free(s); + } void show(char *group, FILE *fp){ - char *c = malloc(sizeof(char)); + char *task = malloc(MAXLINE * sizeof(char)); + struct task tmp; + + printf("\twhileloop\n"); + int j = 0; - while (fgets(c, 1, fp) != NULL ){ - if (strcmp(group, "all") == 0 || strcmp(gettask(fp).group, group) == 0){ - formattask(gettask(fp)); + while ((fgets(task, MAXLINE, fp)) != NULL ){ + printf("\t%i-nloop\n", ++j); + tmp = gettask(task); + if (strcmp(group, "all") == 0 || strcmp(tmp.group, group) == 0){ + formattask(tmp); } } - free(c); + free(task); } diff --git a/.ccls-cache/@home@huck@.repos@odot/file.c.blob b/.ccls-cache/@home@huck@.repos@odot/file.c.blob index 6379548e81af1a96113d3e1c900b96ed4a7a847c..3d1f47fff9c181a3fe5cacd6a080fcba6cf684e1 100644 GIT binary patch literal 7499 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 X9%IHq_aJOLkVL@Dw= delta 2847 zcmai0e{37|75DdiaW3|`cAc|(an5iyvAJB_;Kh!6v7OWjN$S{L6FIXJQguq3Q0Nwt zHchsHXw3>`NZX+F%erYm5nZ7OiAfbd1e(Smi_o-E5J(ekRVt)ztyU)XgN-4eIo`Vx zhif&>e|+E9pL^eT@5kr8@102fY@J=TEFJyq;u{uXd3b!y@!$hBR^`Ks^oOkY{9?`P zR^p}i*Y&XJrgV(jylLx*I6`~98~C-{TH$h2mh^JH0v&S4Dn)zI!;qq7Gh?w>ta^0j z^lkeWC;a-trd_EcmkxF62c@l_yG}i~ST`&UD?0i0F>cHGKiq8vBi8^WUrE*%zE{c} zf53AOYLvxtliu=s*N5fT7xx=LvHWclkSvdvr*(1cr?d7m|2>Q<;AvFfd(%MYHwshl z8bIqv#-uUEjnUE7>nm}4+|7`-e{U#sHoWXfNC|T=*8uHuyQ)9gyy=~N7w&VTA6EmFtmf0q@pcFu zvi{H8A5+dmetQnjq{Ngt0ckNE(swVtop?4sKY$uoA^qp~p1SkGgVsC(-CVbzkNo(Y z?=P1Q81L=jddvXUPQPb-+u}p{o&TQ1Gksj2pdYRMWNs;au!2C&os;$JKX@qe*W%_d z0t4;=N&n^xOH5>sPe&l{%gg!)d*6TK$%~_(AW#qs*Xd7vRQuVDr(QjRz#unBx%y2~ z3)f;$Cdx$(i4MYJf_~9H`#KV%d+cImRa!o?kiHnuAHDI?@$~a&PwIzWIr!&KH>-+1 zFnap*`|O?lL91d-n7m*m)?5ZwWs{~1{(p@cr3Q@Bf7!b#4xhtZ5J$w(W-`Ysyx9Y% z>}=CNJ|EA2>g)XnhV7DFF;nW?vO8*WdbP5;&6GMp5t90Q`);lr8NXaNfkp&P=r?gz zltr^uai4g=q|u->n63I1zhSj%G$03B@ii+zEYS6J8?VE2MtPIc>#?0Na&zdccU8iPRsm>7vnFabDKfRRlrjBMpv&5Yy;G${d+QLnSR9?Fgs z!lpxslZ5VYjzPt-mQ-)vD?Uzuf6P}~ zxl_Jl>(tcD+6iU%j=OH1*{Id+?oO{*j1fNXk$`5@#?^{80RWzy43 zqr7ouat3VOu`?8vL*EZ!L2QD}&miA7RzowWA{2#Dp7=9ABKI@ z7nSIezu7DPQas9%@(;@USW<02`i|tKvgB@TR2o%@1eKu5lN+Kpv`S>9AwlPsq&o>; zcS$bke+gg8bc&sRiEMCh0De}l7F!@uE*CS(Y=zyx@KK>(ZkYpCGi>Y1(xK>xor^L@&_E$ zWPV~!#)`;u7Ey%HI}%spQG+6$ID8$R4J 0){ - printf("\n%i-nloop\n",n); - if (*arg[0] != '-'){ - strcat(s, *arg); - strcat(s, (n > 1) ? " " : ""); + while(--n > 0){ + printf("\t%i-nloop\n",n); + if ((*++arg)[0] != '-'){ + strcat(note, *arg); + strcat(note, " "); } else if (strcmp(*arg,"-g") == 0){ - strcpy(group, *arg); + strcpy(group, (*++arg)); + n--; } } - strcpy(tmp.task, s); - strcpy(tmp.group, group); - free(s); + printf("\t%s %s getnote\n",note,group); + tmp = maketask(note,group); + free(note); return tmp; } @@ -32,19 +34,19 @@ struct task getnote(int n, char *arg[], char *group){ short getopt(int n, char *arg[]){ short options; - printf("\nreturn1\n"); + printf("\treturn1\n"); /* show list if no arguments given */ if (n == 1) return 1; - printf("\ncheckopt\n"); + printf("\tcheckopt\n"); while (--n > 0 && (*++arg)[0] == '-'){ /* if theres a d delete, otherwise add */ options += strchr(*arg, 's') ? 1 : 0; options += strchr(*arg, 'n') ? 2 : 0; options += strchr(*arg, 'd') ? 4 : 0; } - printf("%i", options); + printf("\t%i-optcode\n", options); if ((options - 5) > 0) error(2); return options; @@ -52,25 +54,31 @@ short getopt(int n, char *arg[]){ struct task maketask(char *task, char *group){ + printf("\tmaketask\n"); struct task tmp; + + tmp.task = malloc(strlen(task) * sizeof(char)); + tmp.group = malloc(strlen(group) * sizeof(char)); + + strcpy(tmp.task,task); + strcpy(tmp.group,(strcmp(tmp.group,"") == 0) ? "all" : group); - tmp.task = task; - tmp.date = 0; - /* add to all group if group isn't specified */ - tmp.group = (strcmp(group,"") == 0) ? "all" : group; + printf("\t%s-task %s-group\n",tmp.task,tmp.group); return tmp; } -struct task gettask(FILE *fp){ +struct task gettask(char *c){ + printf("\tgettask\n"); struct task tmp; - fscanf(fp,"%s\t%s\t%i\n",tmp.task,tmp.group,&tmp.date); + sscanf(c,"%s\t%s",tmp.task,tmp.group); return tmp; } void puttask(struct task t, FILE *fp){ - fprintf(fp,"%s\t%s\t%i\n",t.task,t.group,t.date); + printf("\t%s %s puttask\n", t.task, t.group); + fprintf(fp,"%s\t%s\n",t.task,t.group); } diff --git a/.ccls-cache/@home@huck@.repos@odot/input.c.blob b/.ccls-cache/@home@huck@.repos@odot/input.c.blob index 19f6e3c21f194716c55d991d8723341c97f3f018..a84d4ccf764a90d6d7d623fa6987359de9133c29 100644 GIT binary patch delta 2159 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 P(>>{y6b3VyE= 4){ - printf("\nrem\n"); + printf("\trem\n"); rem(note, fp); - } else { - printf("\nadd\n"); + } else if (opt >= 2){ + printf("\tadd\n"); add(note, fp); } if (opt % 2 != 0){ - printf("\nshow\n"); + printf("\tshow\n"); show(group, fp); } - - free(group); + printf("\texiting\n"); fclose(fp); + free(group); return 0; } void error(int err){ switch (err) { case 1: - fprintf(stderr,"ERROR: COULD NOT ACCESS FILE: %s\n", "/home/huck/.local/state/odot/todo"); + fprintf(stderr,"ERROR: COULD NOT ACCESS FILE: %s\n", "/home/huck/.local/state/odot/todo.txt"); break; case 2: fprintf(stderr,"ERROR: CANT ADD AND REMOVE SAME TASK\n"); @@ -55,7 +55,7 @@ void dialogue(char *m1, char *m2, int c){ } void formattask(struct task t){ - printf("* %s\t%s\t%i", t.task, t.group, t.date); + printf("* %s\t%s\n", t.task, t.group); } /* Returns: @@ -64,17 +64,13 @@ void formattask(struct task t){ 2 - Group matches 3 - Both match */ -int listcheck(struct task t, FILE *fp){ +int listcheck(struct task t, char *c){ int i; - i += (strcmp(t.task,gettask(fp).task) == 0) ? 1 : 0; - i += (strcmp(t.group,gettask(fp).group) == 0) ? 2 : 0; + i += (strcmp(t.task,gettask(c).task) == 0) ? 1 : 0; + i += (strcmp(t.group,gettask(c).group) == 0) ? 2 : 0; return i; } -char *gettime(void){ - return NULL; -} - /* returns 0 for yes and 1 for no */ int check(void){ printf("Continue? [y/n] (y):"); diff --git a/.ccls-cache/@home@huck@.repos@odot/main.c.blob b/.ccls-cache/@home@huck@.repos@odot/main.c.blob index e10b157d58ad8b30026c94752ab9f0ab52e18939..ecc8316389674dc4b3eb6eb404078fbfff8e5d16 100644 GIT binary patch delta 684 zcmbPXuuz{(i{YO~{i}^^J6V}SLS9W4WRlu^hjl+Qqv+&0oVuDm3O;&&RU8=qOGNb+ zaozepuehYBG`U2fB(XSKAw9JOL~A5xBo<9p;j-cM;_wn;V)SD0pPb31BI3>AE%M)Y z%ReTyTCxAkKvRH*OrkjQ_oy zQT^IN%)XQNbK9_h&Hm4wDz&d?(a(*1)8l9>AOU3#Wr6=wYIjV0Ge30M z@uQbb@?t!eJr;qAfWr!8FiUlMnDWaOkXAIq}?<(7eqa0>X@wrwDFi z0U13xOwg1CWaMN&p;&&#|2KEeEk0V#q{hg`!6q>Iq)>n$%=7K`Rh!k_c0(Ekgm<9(tJimym zOfD4no_t3{U7SULLx4|&QB*)wjE7M|PC|u;QC2`!Z1Q5>ERm0 z!U&I>$w$OB;69(cUPN~?w^)LUvXHV24H+hkmFSC-E(&SHK FjsVla>zx1q delta 757 zcmX|9ZAcSw9KQeEId1NBx82KPsm*Q8W$7d`z4L9J+j7g7K~@q8&9+K{avk_3H- zFp^*Nh9Q1P>q}4uB?UrY&&$r+6d!Fa_j0UcjnToO1 z*}n^SO_N!K|HlH@aOcE_tSJHsFl;W7;;wjU#v4S+?;hdR+aq6p?mv_`;VM3uN~gPy zru-W)n$AU0I_ktx6x)tt+R#Wtm@(&*k!VvGmdw@W7OKULqZVujRAhU(R;ra#n(wdT zzJ5U=RDSggbZ6hBpVWUjxBkkvJ|t2i3|V+6x70f8f_GLVuCPI&r&o!vbVgLRj4u_+ zr`B}Bprsl{Y!u8`63$O!Ro;!8k~zwB?A|~Vd;5X%xUMRddhxyin&@R@p9tnKsK8CR z8Rb&{!=c5IonzW*59Q&M-RD0F^WQHra5{GuWkZ{_5-wR8Le&Z5)&Z*G-Mr)F=d9pF zfMF3Jdl{+GK#lDYsjWk~y`unE<|c3SPM^emh5+0|nHUnuk}SihJ#N$8DY{g^*+9Kc zZn!dZW4yA?lq9EmYC5z;^+7QqR-nGbU>Rhq{BwU6FK=cptaKeqyV8l?!;+Ltq*EBh zQQDdYNZczXX?V)|t&%9yDC7&3s@NEcLx$}&Ji;@+1RQ)(9>GvdE{AxA7ig5vhh}fuNySN8l3$>IH`YtvA?R*gv6WeGM_Jzw-jD_1s_{Dcx-FA1L z%BQ~;`Zzx@j%LCmcwnESzS_u8Ymlq>z;U%`r0PMA$gvFmKhv1fy>__c?3-=N85+az bP%soyFUa8tJm;Dzy(@5y_ftk+ZgJj!WRLbL diff --git a/.ccls-cache/@home@huck@.repos@odot/odot.h b/.ccls-cache/@home@huck@.repos@odot/odot.h index 78c3548..1cd5ff2 100644 --- a/.ccls-cache/@home@huck@.repos@odot/odot.h +++ b/.ccls-cache/@home@huck@.repos@odot/odot.h @@ -10,7 +10,6 @@ struct task { char *task; - int date; char *group; }; @@ -21,7 +20,7 @@ void add(struct task, FILE *); void rem(struct task, FILE *); void show(char *group, FILE *); -int listcheck(struct task, FILE *); +int listcheck(struct task, char *); int geturgency(int); char *gettime(void); @@ -32,6 +31,6 @@ int check(void); struct task maketask(char *, char *); void puttask(struct task n, FILE*); -struct task gettask(FILE *); +struct task gettask(char *); enum color {BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE}; diff --git a/.ccls-cache/@home@huck@.repos@odot/odot.h.blob b/.ccls-cache/@home@huck@.repos@odot/odot.h.blob index ee6868639ad80439d6bc0711f4fa7c5697a9d206..bbbd5b8036bf2bfa2dbc0a8f52fe01e66ab5c715 100644 GIT binary patch delta 847 zcmYjPO=uHA7@aRHWp^|C<7U}iceB}vqcI6-tu?ka+R|e2;6V_pmU=2}X~AMknv{Yd z;>n|SP)|Y;#UfG>FFh%E(L-+{1yKaiLj@737k}b9yBf_N=FRZl_q{jY&PIM~cUuwt z8Xo@mux%n)S*V5$|Lx7y`C7F;UL&=!`LkqdvKC=}e0r=(iUs62DvCdh5M-Tf4j_xN z>~`{i<-huV`pJpM&rw7XnK%Fh5w?{ak~Bx-LJetb0JlrFXr}>eWU~cakkWG61W2Pa zTfsf-o~nqS>)+muF1}D$MfHNFu_zkY+mh=4B5~D3}moJ zYT3Gf=Wz1cmzP4^#FM=YfQLNRP(zkRHkMED5C77Ho09eN=8|L zR4K(*v%~Bbfb^090oV^MH=!i>r4r$*+?zAu^#|)HoO^$~|L5}M8yArc5z}-Io6{9F zRkH*zh>_=ANs6yl(drVw>+pE*Kn*xc@}yIMteWL}on6(_NjgJojf4Ok*_ysLNk{2) zd>*CjtKOcZi}X@_UZkwF?e3B>xUXs5`W$Nf0r1G+^?H>^?h&sNUU=<4T^U?&Yhc!A zbQhWv|MTajsHI8-%zBBlp{HDNx3zYobqj&qovq}W2=p8QcU~l(U{}NmQy90 ZcGCEE5w?o!slcVj=&4xDv4!K=egj||)=B^X delta 1045 zcmZ8gT}TvB6h7CsWp;LEoONe*X5HEC&UmwR+010q+DbIF(nKgI`hiGPG879P`+3ob zh@N`6U=I-m1x3)`LmItkz4V~;5~M{DQ6XUw(L=x6bZ2VQoQLz>JLjJ7JLjHrKQEg~ z`cv>LIXiRP-x17?zngfwWO|d?Z}$zf+t_aF@5cK(Z5NXpn_3!istj~p0`C(5kfmFt z2w7m!%fU5~Xj`zkDK|eN==88q7Krn4 z1)(^^=~bbcS9nE6NC72F%f(C}B!n1E2tu@5EDJ=1XfZ-jh|=?7Ceros&cyhI>hqqS z%Bw{Psi4vsu_l0ZoJ0r%rsdMQ))*gSVKIm`064D(k2O!vj@>)ZYvY~+{dRj-XM1;Y zUdd^kua)D9=4#bAjge@e(SE6#z7#|{Dpf>o)edk|sy^)HVDLr)Ap;DWla`7JF2OQN zKq3LKn64;{2MAA;0z`n&?S-9n{%|^+@gXIxFsqiURX(IuX*E7%t~P6Z$VyrjJ~Z+t zfjNtur(fO=SITF;1ASarIwTb^-y-K(>5Dzi@Xbm1=RWQndb73W=f%@!bAUiY00mAy zTPNQtPL|||4~20!$uhwTvsy~4^dY0%VEJGPGq0I6Stgcbv31DVmrV_tC-*+7-&NNN zKzn2{NP38!EASzP^rXBpNOqGhZ@-(+ad~-=93>~b{ZT@{%2&$rjce~}>%*!2eFp~) zfgtc~YE-PI+>@%JrXVNKbD>766;*aTT2f+yRu+82MYZfwA8(BBZz(&>? zd>(&rwQka%V{ZnWPjoC?ERa^R!{cR0kA%~$q=I-6E-nztH*&sE?_VLa(#*I#X0e%> TCqy@gONvPiY4$W2{!jTESw;>5 diff --git a/file.c b/file.c index 2d5b277..4fbcfb9 100644 --- a/file.c +++ b/file.c @@ -1,63 +1,71 @@ #include "odot.h" void add(struct task t, FILE *fp){ - printf("\nalloc\n"); - char *c = malloc(strlen(t.task)*sizeof(char)); - printf("\nfopen\n"); - FILE *buf = fopen("odot.tmp", "w"); + printf("\talloc\n"); + char *line = malloc(MAXLINE*sizeof(char)); + printf("\tfopen\n"); + FILE *buf = fopen("/home/huck/.local/state/odot/odot.txt", "w+"); int i = 0; - printf("\nloopstart\n"); - int j = 0; - while (fgets(c,strlen(t.task),fp) != NULL){ - printf("\n%i-nloop\n", j++); - switch (listcheck(t,fp)){ - case 3: - dialogue("Already on todo list", t.task, CYAN); - printf("Remove from list?"); - if (check() == 0){ + printf("\tNULLcheck\n"); + if (fgets(line,MAXLINE,fp) == NULL){ + puttask(t,buf); + } else { + printf("\tloopstart\n"); + int j = 0; + while (fgets(line,MAXLINE,fp) != NULL){ + printf("\t%i-nloop\n", ++j); + switch (listcheck(t,line)){ + case 3: + dialogue("Already on todo list", t.task, CYAN); + printf("Remove from list?"); + if (check() == 0){ + break; + } else { + puttask(gettask(line), buf); + break; + } + case 1: + dialogue("Already on list in a different group", gettask(line).group, YELLOW); + if (check() == 0){ + puttask(t,buf); + i++; + } + puttask(gettask(line), buf); break; - } else { - puttask(gettask(fp), buf); + default: + /* first time t.task is lexigraphically greater than a previous task */ + if (i == 0 && strcmp(line,t.task) > 0){ + puttask(t,buf); + ++i; + } + puttask(gettask(line), buf); break; - } - case 1: - dialogue("Already on list in a different group", gettask(fp).group, YELLOW); - if (check() == 0){ - puttask(t,buf); - i++; - } - puttask(gettask(fp), buf); - break; - default: - /* first time t.task is lexigraphically greater than a previous task */ - if (i == 0 && strcmp(c,t.task) > 0){ - puttask(t,buf); - ++i; - } - puttask(gettask(fp), buf); - break; + } } } - free(c); fclose(fp); fclose(buf); - remove("/home/huck/.local/state/odot/todo"); - rename("odot.tmp", "/home/huck/.local/state/odot/todo"); + remove("/home/huck/.local/state/odot/todo.txt"); + rename("/home/huck/.local/state/odot/odot.txt", "/home/huck/.local/state/odot/todo.txt"); + free(line); + fp = fopen("/home/huck/.local/state/odot/todo.txt", "w+"); + if (!fp) + error(1); return; } void rem(struct task t, FILE *fp){ char *s = malloc(MAXLINE * sizeof(char)); - FILE *buf = fopen("odot.tmp", "w"); + FILE *buf = fopen("/home/huck/.local/state/odot/odot.txt", "w+"); int i = 0; while (fgets(s, MAXLINE, fp) != NULL){ s[strlen(s) - 1] = 0; if (strcmp(t.task, s) != 0){ - fputs(strcat(s,"\n"),buf); + fputs(strcat(s,"\t"),buf); } else { i++; } @@ -66,8 +74,10 @@ void rem(struct task t, FILE *fp){ fclose(fp); fclose(buf); - remove ("/home/huck/.local/state/odot/todo"); - rename("odot.tmp", "/home/huck/.local/state/odot/todo"); + remove ("/home/huck/.local/state/odot/todo.txt"); + rename("/home/huck/.local/state/odot/odot.txt", "/home/huck/.local/state/odot/todo.txt"); + + fp = fopen("/home/huck/.local/state/odot/todo.txt", "w+"); if (i == 0){ dialogue("Task not found", t.task, YELLOW); @@ -76,18 +86,24 @@ void rem(struct task t, FILE *fp){ add(t,fp); } } - free(s); + } void show(char *group, FILE *fp){ - char *c = malloc(sizeof(char)); + char *task = malloc(MAXLINE * sizeof(char)); + struct task tmp; + + printf("\twhileloop\n"); + int j = 0; - while (fgets(c, 1, fp) != NULL ){ - if (strcmp(group, "all") == 0 || strcmp(gettask(fp).group, group) == 0){ - formattask(gettask(fp)); + while ((fgets(task, MAXLINE, fp)) != NULL ){ + printf("\t%i-nloop\n", ++j); + tmp = gettask(task); + if (strcmp(group, "all") == 0 || strcmp(tmp.group, group) == 0){ + formattask(tmp); } } - free(c); + free(task); } diff --git a/input.c b/input.c index 0cb2c50..4d39442 100644 --- a/input.c +++ b/input.c @@ -1,26 +1,28 @@ #include "odot.h" struct task getnote(int n, char *arg[], char *group){ - char *s = malloc(MAXLINE * sizeof(char)); + char *note = malloc(MAXLINE * sizeof(char)); struct task tmp; - if (n == 1) - printf("\nreturn from note\n"); + if (n == 1){ + printf("\t\treturn from note\n"); return tmp; + } - while(n-- > 0){ - printf("\n%i-nloop\n",n); - if (*arg[0] != '-'){ - strcat(s, *arg); - strcat(s, (n > 1) ? " " : ""); + while(--n > 0){ + printf("\t%i-nloop\n",n); + if ((*++arg)[0] != '-'){ + strcat(note, *arg); + strcat(note, " "); } else if (strcmp(*arg,"-g") == 0){ - strcpy(group, *arg); + strcpy(group, (*++arg)); + n--; } } - strcpy(tmp.task, s); - strcpy(tmp.group, group); - free(s); + printf("\t%s %s getnote\n",note,group); + tmp = maketask(note,group); + free(note); return tmp; } @@ -32,19 +34,19 @@ struct task getnote(int n, char *arg[], char *group){ short getopt(int n, char *arg[]){ short options; - printf("\nreturn1\n"); + printf("\treturn1\n"); /* show list if no arguments given */ if (n == 1) return 1; - printf("\ncheckopt\n"); + printf("\tcheckopt\n"); while (--n > 0 && (*++arg)[0] == '-'){ /* if theres a d delete, otherwise add */ options += strchr(*arg, 's') ? 1 : 0; options += strchr(*arg, 'n') ? 2 : 0; options += strchr(*arg, 'd') ? 4 : 0; } - printf("%i", options); + printf("\t%i-optcode\n", options); if ((options - 5) > 0) error(2); return options; @@ -52,25 +54,31 @@ short getopt(int n, char *arg[]){ struct task maketask(char *task, char *group){ + printf("\tmaketask\n"); struct task tmp; + + tmp.task = malloc(strlen(task) * sizeof(char)); + tmp.group = malloc(strlen(group) * sizeof(char)); + + strcpy(tmp.task,task); + strcpy(tmp.group,(strcmp(tmp.group,"") == 0) ? "all" : group); - tmp.task = task; - tmp.date = 0; - /* add to all group if group isn't specified */ - tmp.group = (strcmp(group,"") == 0) ? "all" : group; + printf("\t%s-task %s-group\n",tmp.task,tmp.group); return tmp; } -struct task gettask(FILE *fp){ +struct task gettask(char *c){ + printf("\tgettask\n"); struct task tmp; - fscanf(fp,"%s\t%s\t%i\n",tmp.task,tmp.group,&tmp.date); + sscanf(c,"%s\t%s",tmp.task,tmp.group); return tmp; } void puttask(struct task t, FILE *fp){ - fprintf(fp,"%s\t%s\t%i\n",t.task,t.group,t.date); + printf("\t%s %s puttask\n", t.task, t.group); + fprintf(fp,"%s\t%s\n",t.task,t.group); } diff --git a/main.c b/main.c index 9b86cd1..e498acf 100644 --- a/main.c +++ b/main.c @@ -1,46 +1,46 @@ #include "odot.h" int main(int argc, char *argv[]){ - printf("\nstart\n"); + printf("\tstart\n"); struct task note; short opt; FILE *fp; char *group = malloc(MAXLINE*sizeof(char)); - printf("\nfopen\n"); - fp = fopen("/home/huck/.local/state/odot/todo", "w+"); + printf("\tfopen\n"); + fp = fopen("/home/huck/.local/state/odot/todo.txt", "w+"); if (!fp){ error(1); } - printf("\ngetopt\n"); + printf("\tgetopt\n"); opt = getopt(argc, argv); - printf("\ngetnote\n"); + printf("\tgetnote\n"); note = getnote(argc, argv, group); if (opt >= 4){ - printf("\nrem\n"); + printf("\trem\n"); rem(note, fp); - } else { - printf("\nadd\n"); + } else if (opt >= 2){ + printf("\tadd\n"); add(note, fp); } if (opt % 2 != 0){ - printf("\nshow\n"); + printf("\tshow\n"); show(group, fp); } - - free(group); + printf("\texiting\n"); fclose(fp); + free(group); return 0; } void error(int err){ switch (err) { case 1: - fprintf(stderr,"ERROR: COULD NOT ACCESS FILE: %s\n", "/home/huck/.local/state/odot/todo"); + fprintf(stderr,"ERROR: COULD NOT ACCESS FILE: %s\n", "/home/huck/.local/state/odot/todo.txt"); break; case 2: fprintf(stderr,"ERROR: CANT ADD AND REMOVE SAME TASK\n"); @@ -55,7 +55,7 @@ void dialogue(char *m1, char *m2, int c){ } void formattask(struct task t){ - printf("* %s\t%s\t%i", t.task, t.group, t.date); + printf("* %s\t%s\n", t.task, t.group); } /* Returns: @@ -64,17 +64,13 @@ void formattask(struct task t){ 2 - Group matches 3 - Both match */ -int listcheck(struct task t, FILE *fp){ +int listcheck(struct task t, char *c){ int i; - i += (strcmp(t.task,gettask(fp).task) == 0) ? 1 : 0; - i += (strcmp(t.group,gettask(fp).group) == 0) ? 2 : 0; + i += (strcmp(t.task,gettask(c).task) == 0) ? 1 : 0; + i += (strcmp(t.group,gettask(c).group) == 0) ? 2 : 0; return i; } -char *gettime(void){ - return NULL; -} - /* returns 0 for yes and 1 for no */ int check(void){ printf("Continue? [y/n] (y):"); diff --git a/odot b/odot index 1c93fb8b2c1bea2ab336ac8e48fc500c0c1690f6..f13d2281af9e0bc113ccc70ba193c8e28596de48 100755 GIT binary patch delta 5393 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 diff --git a/odot.h b/odot.h index 78c3548..1cd5ff2 100644 --- a/odot.h +++ b/odot.h @@ -10,7 +10,6 @@ struct task { char *task; - int date; char *group; }; @@ -21,7 +20,7 @@ void add(struct task, FILE *); void rem(struct task, FILE *); void show(char *group, FILE *); -int listcheck(struct task, FILE *); +int listcheck(struct task, char *); int geturgency(int); char *gettime(void); @@ -32,6 +31,6 @@ int check(void); struct task maketask(char *, char *); void puttask(struct task n, FILE*); -struct task gettask(FILE *); +struct task gettask(char *); enum color {BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE}; -- 2.44.2