From fc2bed655050d32fc6f4c98c26f4d89361be88b8 Mon Sep 17 00:00:00 2001
From: ptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Mon, 26 Apr 2004 21:44:22 +0000
Subject: rewrite i_read() i_read_key() thread() select_mode()
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@1863 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
mbbsd/bbs.c | 108 ++-----------
mbbsd/more.c | 40 ++---
mbbsd/read.c | 516 ++++++++++++++++++++++-------------------------------------
mbbsd/var.c | 1 -
4 files changed, 221 insertions(+), 444 deletions(-)
(limited to 'mbbsd')
diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index 7719f140..3ac99fd7 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -1138,101 +1138,21 @@ read_post(int ent, fileheader_t * fhdr, char *direct)
brc_addlist(fhdr->filename);
strncpy(currtitle, subject(fhdr->title), TTLEN);
- strncpy(currowner, subject(fhdr->owner), IDLEN + 2);
-
- switch (more_result) {
- case 1:
- return READ_PREV;
- case 2:
- return RELATE_PREV;
- case 3:
- return READ_NEXT;
- case 4:
- return RELATE_NEXT;
- case 5:
- return RELATE_FIRST;
- case 6:
- return FULLUPDATE;
- case 7:
- case 8:
- if (CheckPostPerm()) {
- strlcpy(quote_file, genbuf, sizeof(quote_file));
- do_reply(fhdr);
- *quote_file = 0;
- }
- return FULLUPDATE;
- case 9:
- return 'A';
- case 10:
- return 'a';
- case 11:
- return '/';
- case 12:
- return '?';
- }
-
-
- outmsg("\033[34;46m �\\Ū�峹 \033[31;47m (R/Y)\033[30m�^�H \033[31m"
- "(=[]<>)\033[30m�����D�D \033[31m(����)\033[30m�W�U�� \033[31m(��)"
- "\033[30m���} \033[m");
-
- switch (igetch()) {
- case 'q':
- case 'Q':
- case KEY_LEFT:
- break;
-
- case ' ':
- case KEY_RIGHT:
- case KEY_DOWN:
- case KEY_PGDN:
- case 'n':
- case Ctrl('N'):
- return READ_NEXT;
-
- case KEY_UP:
- case 'p':
- case Ctrl('P'):
- case KEY_PGUP:
- return READ_PREV;
-
- case '=':
- return RELATE_FIRST;
- case ']':
- case 't':
- return RELATE_NEXT;
-
- case '[':
- return RELATE_PREV;
-
- case '.':
- case '>':
- return THREAD_NEXT;
-
- case ',':
- case '<':
- return THREAD_PREV;
-
- case Ctrl('I'):
- t_idle();
- return FULLUPDATE;
-
- case 'X':
- recommend(ent, fhdr, direct);
- return FULLUPDATE;
-
- case 'y':
- case 'r':
- case 'R':
- case 'Y':
- if (CheckPostPerm()) {
- strlcpy(quote_file, genbuf, sizeof(quote_file));
- do_reply(fhdr);
- *quote_file = 0;
- }
- }
- return FULLUPDATE;
+ if (more_result)
+ {
+ if(more_result == 999)
+ {
+ if (CheckPostPerm()) {
+ strlcpy(quote_file, genbuf, sizeof(quote_file));
+ do_reply(fhdr);
+ *quote_file = 0;
+ }
+ return FULLUPDATE;
+ }
+ else return more_result;
+ }
+return FULLUPDATE;
}
/* ----------------------------------------------------- */
diff --git a/mbbsd/more.c b/mbbsd/more.c
index d8fb9306..33b36222 100644
--- a/mbbsd/more.c
+++ b/mbbsd/more.c
@@ -385,44 +385,36 @@ more(char *fpath, int promptend)
case 'r':
case 'R':
case 'Y':
- close(fd);
- return 7;
case 'y':
close(fd);
- return 8;
+ return 999;
case 'A':
close(fd);
- return 9;
+ return AUTHOR_PREV;
case 'a':
close(fd);
- return 10;
+ return AUTHOR_NEXT;
case 'F':
+ case 'f':
close(fd);
- return 11;
+ return READ_NEXT;
case 'B':
+ case 'b':
close(fd);
- return 12;
+ return READ_PREV;
case KEY_LEFT:
- close(fd);
- return 6;
case 'q':
close(fd);
- return 0;
- case 'b':
- close(fd);
- return 1;
- case 'f':
- close(fd);
- return 3;
+ return FULLUPDATE;
case ']': /* Kaede ���F�D�D�\Ū��K */
close(fd);
- return 4;
+ return RELATE_NEXT;
case '[': /* Kaede ���F�D�D�\Ū��K */
close(fd);
- return 2;
+ return RELATE_PREV;
case '=': /* Kaede ���F�D�D�\Ū��K */
close(fd);
- return 5;
+ return RELATE_FIRST;
case Ctrl('F'):
case KEY_PGDN:
line = 1;
@@ -430,14 +422,14 @@ more(char *fpath, int promptend)
case 't':
if (viewed == fsize) {
close(fd);
- return 4;
+ return RELATE_NEXT;
}
line = 1;
break;
case ' ':
if (viewed == fsize) {
close(fd);
- return 3;
+ return READ_NEXT;
}
line = 1;
break;
@@ -454,7 +446,7 @@ more(char *fpath, int promptend)
if (viewed == fsize ||
(promptend == 2 && (ch == '\r' || ch == '\n'))) {
close(fd);
- return 3;
+ return READ_NEXT;
}
line = t_lines - 2;
break;
@@ -525,7 +517,7 @@ more(char *fpath, int promptend)
pageno = line = 0;
else {
close(fd);
- return 1;
+ return READ_PREV;
}
}
}
@@ -538,7 +530,7 @@ more(char *fpath, int promptend)
if (pageno <= 1) {
if (lino == 1 || !pageno) {
close(fd);
- return 1;
+ return READ_PREV;
}
if (header && lino <= 5) {
more_goto(fd, viewed = pagebreak[scrollup = lino =
diff --git a/mbbsd/read.c b/mbbsd/read.c
index 3b723841..5e32334e 100644
--- a/mbbsd/read.c
+++ b/mbbsd/read.c
@@ -255,133 +255,47 @@ cursor_pos(keeploc_t * locmem, int val, int from_top)
}
static int
-thread(keeploc_t * locmem, int stype, int *new_ln)
+thread(keeploc_t * locmem, int stypen)
{
- static char a_ans[32], t_ans[32];
- char ans[32], s_pmt[64];
- register char *tag, *query = NULL;
- register int now, pos, match, near = 0;
- fileheader_t fh;
- int circulate_flag = 1; /* circulate at end or begin */
- int fd = -1;
-
- match = 0;
- now = pos = locmem->crs_ln;
- if (stype == 'A') {
- if (!*currowner)
- return DONOTHING;
- str_lower(a_ans, currowner);
- query = a_ans;
- circulate_flag = 0;
- stype = 0;
- } else if (stype == 'a') {
- if (!*currowner)
- return DONOTHING;
- str_lower(a_ans, currowner);
- query = a_ans;
- circulate_flag = 0;
- stype = RS_FORWARD;
- } else if (stype & RS_RELATED) {
- tag = headers[pos - locmem->top_ln].title;
- if (stype & RS_CURRENT) {
- if (stype & RS_FIRST) {
- if (!strncmp(currtitle, tag, TTLEN))
- return DONOTHING;
- near = 0;
- }
- query = currtitle;
- } else {
- query = subject(tag);
- if (stype & RS_FIRST) {
- if (query == tag)
- return DONOTHING;
- near = 0;
- }
- }
- } else if (!(stype & RS_THREAD)) {
- query = (stype & RS_TITLE) ? t_ans : a_ans;
- if (!*query && query == a_ans) {
- if (*currowner)
- strlcpy(a_ans, currowner, sizeof(a_ans));
- else if (*currauthor)
- strlcpy(a_ans, currauthor, sizeof(a_ans));
- }
- snprintf(s_pmt, sizeof(s_pmt),
- "%s�j�M%s [%s] ", (stype & RS_FORWARD) ? "����" : "���e",
- (stype & RS_TITLE) ? "���D" : "�@��", query);
- getdata(b_lines - 1, 0, s_pmt, ans, sizeof(ans), DOECHO);
- if (*ans)
- strcpy(query, ans);
- else if (*query == '\0')
- return DONOTHING;
- }
- tag = fh.owner;
-
- do {
- if (!circulate_flag || stype & RS_RELATED) {
- if (stype & RS_FORWARD) {
- if (++now > last_line){
- if( fd != -1 )
- close(fd);
- return DONOTHING;
- }
- } else {
- if (--now <= 0 || now < pos - 200) {
- if( fd )
- close(fd);
- if ((stype & RS_FIRST) && (near)) {
- *new_ln = near;
- }
- return DONOTHING;
- }
- }
- } else {
- if (stype & RS_FORWARD) {
- if (++now > last_line)
- now = 1;
- } else if (--now <= 0)
- now = last_line;
- }
-
- get_record_keep(currdirect, &fh, sizeof(fileheader_t), now, &fd);
-
- if (fh.owner[0] == '-')
- continue;
-
- if (stype & RS_THREAD) {
- if (strncasecmp(fh.title, str_reply, 3)) {
- if( fd )
- close(fd);
- *new_ln = now;
- return DONOTHING;
- }
- continue;
- }
- if (stype & RS_TITLE)
- tag = subject(fh.title);
-
- if (((stype & RS_RELATED) && !strncmp(tag, query, 40)) ||
- (!(stype & RS_RELATED) && ((query == currowner) ?
- !strcmp(tag, query) :
- strstr_lower(tag, query)))) {
- if ((stype & RS_FIRST) && tag != fh.title) {
- near = now;
- continue;
- }
- *new_ln = now;
- if ((!(stype & RS_CURRENT)) &&
- (stype & RS_RELATED) &&
- strncmp(currtitle, query, TTLEN)) {
- strncpy(currtitle, query, TTLEN);
- match = PARTUPDATE;
- }
- break;
- }
- } while (now != pos);
-
- if( fd != -1 )
- close(fd);
- return match;
+ int pos = locmem->crs_ln, jump=200, new_ln;
+ fileheader_t fh;
+ char *key =
+ stypen & RS_AUTHOR ? headers[pos - locmem->top_ln].owner :
+ (subject( stypen & RS_CURRENT ?
+ currtitle :
+ headers[pos - locmem->top_ln].title ));
+ int fd=-1, step = stypen & RS_FORWARD ? 1 : -1;
+
+ for(new_ln = pos+step;
+ new_ln>0 && new_ln<=last_line && --jump>0; new_ln+=step)
+ {
+ get_record_keep(currdirect, &fh, sizeof(fileheader_t), new_ln, &fd);
+ if(stypen & RS_TITLE)
+ {
+ if(stypen & RS_FIRST)
+ {
+ if(!strcmp(fh.title, key)) break;
+ }
+ else
+ if(!strcmp(subject(fh.title), key)) break;
+ }
+ else if(stypen & RS_NEWPOST)
+ {
+ if(strncmp(fh.title,"Re:",3)) break;
+ }
+ else // RS_AUTHOR
+ {
+ if(!strcmp(subject(fh.owner), key)) break;
+ }
+ }
+ if(fd!=-1) close(fd);
+ if(jump <=0 || new_ln<=0 || new_ln>last_line) new_ln = pos; //didn't find
+ else
+ {
+ strncpy(currtitle, fh.title, TTLEN);
+ strncpy(currtitle, fh.title, TTLEN);
+ }
+ return new_ln;
}
@@ -416,148 +330,105 @@ static int
select_read(keeploc_t * locmem, int sr_mode)
{
#define READSIZE 64 // 8192 / sizeof(fileheader_t)
- char *tag, *query = NULL, *temp;
- fileheader_t fhs[READSIZE];
- char fpath[80], genbuf[MAXPATHLEN], buf3[5];
- static char t_ans[TTLEN + 1] = "";
- static char a_ans[TTLEN + 1] = "";
- int fd, fr, size = sizeof(fileheader_t), i, len;
- struct stat st;
- /* rocker.011018: make a reference number for process article */
- int reference = 0;
-
- if ((currmode & MODE_SELECT))
- return -1;
- if (sr_mode == RS_TITLE)
- query = subject(headers[locmem->crs_ln - locmem->top_ln].title);
- else if (sr_mode == RS_NEWPOST) {
- strlcpy(buf3, "Re: ", sizeof(buf3));
- query = buf3;
- }
- else if (sr_mode == RS_THREAD) {
-
- } else {
- char buff[80];
- char newdata[35];
-
- query = (sr_mode == RS_RELATED) ? t_ans : a_ans;
- snprintf(buff, sizeof(buff), "�j�M%s [%s] ",
- (sr_mode == RS_RELATED) ? "���D" : "�@��", query);
- getdata(b_lines, 0, buff, newdata, sizeof(newdata), DOECHO);
- if (newdata[0])
- strcpy(query, newdata);
- if (!(*query))
- return DONOTHING;
- }
-
- if ((fd = open(currdirect, O_RDONLY, 0)) != -1) {
- snprintf(genbuf, sizeof(genbuf), "SR.%s", cuser.userid);
- if (currstat == RMAIL)
- sethomefile(fpath, cuser.userid, genbuf);
- else
- setbfile(fpath, currboard, genbuf);
- if (((fr = open(fpath, O_WRONLY | O_CREAT | O_TRUNC, 0600)) != -1)) {
- switch (sr_mode) {
- case RS_TITLE:
- while( (len = read(fd, fhs, sizeof(fhs))) > 0 ){
- len /= sizeof(fileheader_t);
- for( i = 0 ; i < len ; ++i ){
- ++reference;
- tag = subject(fhs[i].title);
- if (!strncmp(tag, query, 40)) {
- fhs[i].money = reference | FHR_REFERENCE;
- write(fr, &fhs[i], size);
- }
- }
- }
- break;
- case RS_RELATED:
- while( (len = read(fd, fhs, sizeof(fhs))) > 0 ){
- len /= sizeof(fileheader_t);
- for( i = 0 ; i < len ; ++i ){
- ++reference;
- tag = fhs[i].title;
- if (strcasestr(tag, query)) {
- fhs[i].money = reference | FHR_REFERENCE;
- write(fr, &fhs[i], size);
- }
- }
- }
- break;
- case RS_NEWPOST:
- while( (len = read(fd, fhs, sizeof(fhs))) > 0 ){
- len /= sizeof(fileheader_t);
- for( i = 0 ; i < len ; ++i ){
- ++reference;
- tag = fhs[i].title;
- temp = strstr(tag, query);
- if (temp == NULL || temp != tag) {
- fhs[i].money = reference | FHR_REFERENCE;
- write(fr, &fhs[i], size);
- }
- }
- }
- break;
- case RS_AUTHOR:
- while( (len = read(fd, fhs, sizeof(fhs))) > 0 ){
- len /= sizeof(fileheader_t);
- for( i = 0 ; i < len ; ++i ){
- ++reference;
- tag = fhs[i].owner;
- if (strcasestr(tag, query)) {
- fhs[i].money = reference | FHR_REFERENCE;
- write(fr, &fhs[i], size);
- }
- }
- }
- break;
- case RS_THREAD:
- while( (len = read(fd, fhs, sizeof(fhs))) > 0 ){
- len /= sizeof(fileheader_t);
- for( i = 0 ; i < len ; ++i ){
- ++reference;
- if (fhs[i].filemode & FILE_MARKED) {
- fhs[i].money = reference | FHR_REFERENCE;
- write(fr, &fhs[i], size);
- }
- }
- }
- break;
+ fileheader_t fhs[READSIZE];
+ char newdirect[MAXPATHLEN];
+ static int _mode=0;
+ static char title[TTLEN + 1] = "";
+ static char author[IDLEN + 1] = "";
+ char genbuf[MAXPATHLEN], *p;
+ int len, fd, fr, i, count=0, reference = 0;
+
+ fileheader_t *fh = &headers[locmem->crs_ln - locmem->top_ln];
+ if(! sr_mode)
+ {
+ _mode=0;
+ return READ_REDRAW;
+ }
+ else if(sr_mode & RS_AUTHOR)
+ {
+ if(!author[0]) strcpy(author, fh->owner);
+ if(!getdata_buf(b_lines, 0, "�j�M�@��:", author, IDLEN+1, LCECHO))
+ return READ_REDRAW;
+ }
+ else if(sr_mode & RS_KEYWORD)
+ {
+ if(!title[0]) strcpy(author, subject(fh->title));
+ if(!getdata_buf(b_lines, 0, "�j�M���D:", title, TTLEN, DOECHO))
+ return READ_REDRAW;
+ }
+ else if(sr_mode & RS_TITLE)
+ strcpy(title, subject(fh->title));
+
+ _mode |= sr_mode;
+
+ p = strstr(currdirect, "SR");
+
+ snprintf(genbuf, sizeof(genbuf), "%s.%X.%X.%X",
+ p ? p : "SR",
+ _mode, StringHash(title), StringHash(author));
+ if(strlen(genbuf)>MAXPATHLEN-50) return READ_REDRAW; // avoid overflow
+
+ if (currstat == RMAIL)
+ sethomefile(newdirect, cuser.userid, genbuf);
+ else
+ setbfile(newdirect, currboard, genbuf);
+
+ if(now - dasht(newdirect) > 600)
+ {
+ if ((fd = open(newdirect, O_CREAT | O_RDWR, 0600))==-1) return READ_REDRAW;
+ if ((fr = open(currdirect, O_RDONLY, 0)) != -1) {
+ while( (len = read(fr, fhs, sizeof(fhs))) > 0 ){
+ len /= sizeof(fileheader_t);
+ for( i = 0 ; i < len ; ++i ){
+ reference++;
+ if(_mode & RS_MARK &&
+ !(fhs[i].filemode & FILE_MARKED)) continue;
+ if(_mode & RS_NEWPOST &&
+ !strncmp(fhs[i].title, "Re:", 3)) continue;
+ if(_mode & RS_AUTHOR &&
+ strcasecmp(fhs[i].owner, author)) continue;
+ if(_mode & RS_KEYWORD &&
+ !strcasestr(fhs[i].title, title)) continue;
+ if(_mode & RS_TITLE &&
+ strcmp(subject(fhs[i].title), title))
+ continue;
+ count ++;
+ fhs[i].money = reference | FHR_REFERENCE;
+ write(fd, &fhs[i], sizeof(fileheader_t));
}
- fstat(fr, &st);
- close(fr);
- }
- close(fd);
- if (st.st_size) {
- currmode |= MODE_SELECT;
- strlcpy(currdirect, fpath, sizeof(currdirect));
- }
+ } // end while
+ close(fr);
+ }
+ close(fd);
}
- return READ_REDRAW;
+ else
+ count = dashs(newdirect);
+ if(count) {
+ strlcpy(currdirect, newdirect, sizeof(currdirect));
+ currmode |= MODE_SELECT;
+ return NEWDIRECT;
+ }
+ return READ_REDRAW;
}
#define select_read_mode(m) select_read(locmem, m) ? NEWDIRECT:READ_REDRAW
static int
-i_read_key(onekey_t * rcmdlist, char default_ch, keeploc_t * locmem,
+i_read_key(onekey_t * rcmdlist, keeploc_t * locmem,
int bid, int bottom_line)
{
int mode = DONOTHING;
int num;
char direct[60];
- int ch, new_ln= locmem->crs_ln;
+ static char default_ch=0;
+ int ch, new_ln= locmem->crs_ln, lastmode=0;
do {
+ if((mode=cursor_pos(locmem, new_ln, 10))!=DONOTHING)
+ return mode;
if(default_ch)
- {
- ch = default_ch;
- default_ch=0;
- }
+ ch = default_ch;
else
- {
- if((mode=cursor_pos(locmem, new_ln, 10))!=DONOTHING)
- return mode;
- ch = igetch();
- }
+ ch = igetch();
switch (ch) {
case '0':
case '1':
@@ -576,16 +447,16 @@ i_read_key(onekey_t * rcmdlist, char default_ch, keeploc_t * locmem,
case 'e':
case KEY_LEFT:
if(currmode & MODE_SELECT){
- char genbuf[256];
+ char genbuf[256];
fileheader_t *fhdr = &headers[locmem->crs_ln - locmem->top_ln];
+ select_read(locmem, 0);
board_select();
- setbdir(genbuf, currboard);
- locmem = getkeep(genbuf, 0, 1);
- locmem->crs_ln =
+ setbdir(genbuf, currboard);
+ locmem = getkeep(genbuf, 0, 1);
+ locmem->crs_ln =
getindex(genbuf, fhdr->filename, sizeof(fileheader_t));
- num = locmem->crs_ln - p_lines + 1;
- locmem->top_ln = num < 1 ? 1 : num;
-
+ num = locmem->crs_ln - p_lines + 1;
+ locmem->top_ln = num < 1 ? 1 : num;
mode = NEWDIRECT;
}
else
@@ -597,47 +468,47 @@ i_read_key(onekey_t * rcmdlist, char default_ch, keeploc_t * locmem,
break;
case Ctrl('H'):
- mode = select_read_mode(RS_NEWPOST);
+ mode = select_read(locmem, RS_NEWPOST);
break;
case 'a':
case 'A':
- mode = select_read_mode(RS_AUTHOR);
+ mode = select_read(locmem, RS_AUTHOR);
break;
case 'G':
- mode = select_read_mode(RS_THREAD);
+ mode = select_read(locmem, RS_MARK);
break;
case '/':
case '?':
- mode = select_read_mode(RS_RELATED);
+ mode = select_read(locmem, RS_KEYWORD);
break;
case 'S':
- mode = select_read_mode(RS_TITLE);
+ mode = select_read(locmem, RS_TITLE);
break;
case '=':
- mode = thread(locmem, RELATE_FIRST, &new_ln);
+ new_ln = thread(locmem, RELATE_FIRST);
break;
case '\\':
- mode = thread(locmem, CURSOR_FIRST, &new_ln);
+ new_ln = thread(locmem, CURSOR_FIRST);
break;
case ']':
- mode = thread(locmem, RELATE_NEXT, &new_ln);
+ new_ln = thread(locmem, RELATE_NEXT);
break;
case '+':
- mode = thread(locmem, CURSOR_NEXT, &new_ln);
+ new_ln = thread(locmem, CURSOR_NEXT);
break;
case '[':
- mode = thread(locmem, RELATE_PREV, &new_ln);
+ new_ln = thread(locmem, RELATE_PREV);
break;
case '-':
- mode = thread(locmem, CURSOR_PREV, &new_ln);
+ new_ln = thread(locmem, CURSOR_PREV);
break;
case '<':
case ',':
- mode = thread(locmem, THREAD_PREV, &new_ln);
+ new_ln = thread(locmem, NEWPOST_PREV);
break;
case '.':
case '>':
- mode = thread(locmem, THREAD_NEXT, &new_ln);
+ new_ln = thread(locmem, NEWPOST_NEXT);
break;
case 'p':
case 'k':
@@ -751,8 +622,48 @@ i_read_key(onekey_t * rcmdlist, char default_ch, keeploc_t * locmem,
else
mode = (*func)(locmem->crs_ln,
&headers[locmem->crs_ln - locmem->top_ln], currdirect);
- }
- }
+ if(mode == READ_SKIP)
+ mode = lastmode;
+
+ // �H�U�o�X�� mode �n�A�B�z���
+ if(mode == READ_PREV || mode == READ_NEXT ||
+ mode == RELATE_PREV || mode == RELATE_FIRST ||
+ mode == AUTHOR_NEXT || mode == AUTHOR_PREV ||
+ mode == RELATE_NEXT)
+ {
+ lastmode = mode;
+
+ switch(mode)
+ {
+ case READ_PREV:
+ new_ln = locmem->crs_ln - 1;
+ break;
+ case READ_NEXT:
+ new_ln = locmem->crs_ln + 1;
+ break;
+ case RELATE_PREV:
+ new_ln = thread(locmem, RELATE_PREV);
+ break;
+ case RELATE_NEXT:
+ new_ln = thread(locmem, RELATE_NEXT);
+ break;
+ case RELATE_FIRST:
+ new_ln = thread(locmem, RELATE_FIRST);
+ break;
+ case AUTHOR_PREV:
+ new_ln = thread(locmem, AUTHOR_PREV);
+ break;
+ case AUTHOR_NEXT:
+ new_ln = thread(locmem, AUTHOR_NEXT);
+ break;
+ }
+ if(new_ln != locmem->crs_ln)
+ {mode=DONOTHING; default_ch = 'r';}
+ else mode = FULLUPDATE;
+ }
+ else {default_ch = 0; lastmode=0;}
+ } //end if (func != NULL)
+ } // ch > 0 && ch <= onekey_size
break;
} // end switch
}
@@ -783,15 +694,15 @@ get_records_and_bottom(char *direct, fileheader_t* headers,
rv += get_records(directbottom, headers+n, sizeof(fileheader_t), 1,
p_lines - n );
return rv;
-}
+}
void
i_read(int cmdmode, char *direct, void (*dotitle) (), void (*doentry) (), onekey_t * rcmdlist, int bidcache)
{
keeploc_t *locmem = NULL;
- int recbase = 0, mode, lastmode = 0, last_ln;
+ int recbase = 0, mode;
int num = 0, entries = 0, n_bottom=0;
int i;
- char currdirect0[64], default_ch = 0;
+ char currdirect0[64];
int last_line0 = last_line;
int bottom_line = 0;
fileheader_t *headers0 = headers;
@@ -875,53 +786,8 @@ i_read(int cmdmode, char *direct, void (*dotitle) (), void (*doentry) (), onekey
case TITLE_REDRAW:
(*dotitle) ();
break;
- }
-
- mode = i_read_key(rcmdlist, default_ch, locmem, currbid,
- bottom_line);
- if(mode == READ_SKIP)
- mode = lastmode;
- // �H�U�o�X�� mode �n�A�B�z���
- default_ch=0;
- if(mode == READ_PREV || mode == READ_NEXT || mode == RELATE_PREV ||
- mode == RELATE_FIRST || mode == 'A' || mode == 'a' ||
- mode == RELATE_NEXT)
- {
- lastmode = mode;
- last_ln = locmem->crs_ln;
-
- switch(mode)
- {
- case READ_PREV:
- mode = cursor_pos(locmem, locmem->crs_ln - 1, 10);
- break;
- case READ_NEXT:
- mode = cursor_pos(locmem, locmem->crs_ln + 1, 10);
- break;
- case RELATE_PREV:
- thread(locmem, RELATE_PREV, &num);
- mode = cursor_pos(locmem, num, 10);
- break;
- case RELATE_NEXT:
- thread(locmem, RELATE_NEXT, &num);
- mode = cursor_pos(locmem, num, 10);
- break;
- case RELATE_FIRST:
- thread(locmem, RELATE_FIRST, &num);
- mode = cursor_pos(locmem, num, 10);
- break;
- case 'A':
- thread(locmem, 'A', &num);
- mode = cursor_pos(locmem, num, 10);
- break;
- case 'a':
- thread(locmem, 'a', &num);
- mode = cursor_pos(locmem, num, 10);
- break;
- }
- if(locmem->crs_ln != last_ln) default_ch = 'r';
- else mode = FULLUPDATE;
- }
+ } //end switch
+ mode = i_read_key(rcmdlist, locmem, currbid, bottom_line);
} while (mode != DOQUIT);
#undef FHSZ
diff --git a/mbbsd/var.c b/mbbsd/var.c
index f559eb6a..dff359b6 100644
--- a/mbbsd/var.c
+++ b/mbbsd/var.c
@@ -84,7 +84,6 @@ char paste_title[STRLEN];
char paste_path[256];
char currtitle[TTLEN + 1] = "\0";
char vetitle[TTLEN + 1] = "\0";
-char currowner[IDLEN + 2] = "\0";
char currauthor[IDLEN + 2] = "\0";
char currfile[FNLEN];/* current file name @ bbs.c mail.c */
char *currboard = "\0";
--
cgit v1.2.3