mirror of
git://git.psyced.org/git/psyced
synced 2024-08-15 03:25:10 +00:00
Merge remote-tracking branch 'origin'
This commit is contained in:
commit
613715cb17
4 changed files with 13 additions and 7 deletions
|
@ -82,7 +82,7 @@ logClip(maxlen, cutlen) {
|
|||
// TODO: logView *since* timestamp. see also user.c:disconnected()
|
||||
//
|
||||
// uh. vim lpc syntax file doesn't like default in variablenames. renamed.
|
||||
logView(a, showingLog, defAmount) {
|
||||
logView(a, showingLog, defAmount, offset) {
|
||||
string grep;
|
||||
int i, ll;
|
||||
|
||||
|
@ -141,6 +141,9 @@ logView(a, showingLog, defAmount) {
|
|||
P4(("\n%O :logView: %O\n", ME, _log))
|
||||
unless (ll) ll = defAmount || 15;
|
||||
ll *= 4;
|
||||
/* FIXME: here's where the _offset parameter needs to be considered
|
||||
* but let's see if ryuka is serious about wanting to use this ;)
|
||||
*/
|
||||
if (sizeof(_log) < ll) {
|
||||
ll = sizeof(_log);
|
||||
i = 0;
|
||||
|
|
|
@ -2470,7 +2470,7 @@ _request_history(source, mc, data, vars, b) {
|
|||
# endif
|
||||
# endif
|
||||
logView(vars["_match"] || vars["_parameter"] || vars["_amount"],
|
||||
source);
|
||||
source, 0, vars["_offset"]);
|
||||
sendmsg(source, "_echo_history"); // indicate end of history
|
||||
return 1;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue