Now, really fix grep on Windows

This commit is contained in:
Berke Viktor 2012-07-22 02:23:30 +02:00
parent 22cde0e5a2
commit 157dab258e
2 changed files with 4 additions and 4 deletions

View File

@ -2386,7 +2386,11 @@ cmd_lastlog (struct session *sess, char *tbuf, char *word[], char *word_eol[])
if (*word_eol[2]) if (*word_eol[2])
{ {
if (!strcmp (word[2], "-r")) if (!strcmp (word[2], "-r"))
#ifdef WIN32
lastlog (sess, word_eol[3], FALSE);
#else
lastlog (sess, word_eol[3], TRUE); lastlog (sess, word_eol[3], TRUE);
#endif
else else
lastlog (sess, word_eol[2], FALSE); lastlog (sess, word_eol[2], FALSE);
return TRUE; return TRUE;

View File

@ -591,11 +591,7 @@ static char defaultconf_commands[] =
"NAME DIALOG\n" "CMD query %2\n\n"\ "NAME DIALOG\n" "CMD query %2\n\n"\
"NAME DMSG\n" "CMD msg =%2 &3\n\n"\ "NAME DMSG\n" "CMD msg =%2 &3\n\n"\
"NAME EXIT\n" "CMD quit\n\n"\ "NAME EXIT\n" "CMD quit\n\n"\
#ifdef WIN32 /* lastlog -r isn't implemented in fe_lastlog yet */
"NAME GREP\n" "CMD lastlog &2\n\n"\
#else
"NAME GREP\n" "CMD lastlog -r &2\n\n"\ "NAME GREP\n" "CMD lastlog -r &2\n\n"\
#endif
"NAME IGNALL\n" "CMD ignore %2!*@* ALL\n\n"\ "NAME IGNALL\n" "CMD ignore %2!*@* ALL\n\n"\
"NAME J\n" "CMD join &2\n\n"\ "NAME J\n" "CMD join &2\n\n"\
"NAME KILL\n" "CMD quote KILL %2 :&3\n\n"\ "NAME KILL\n" "CMD quote KILL %2 :&3\n\n"\