[BACK]Return to cli.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/Attic/cli.c between version 1.2.2.2 and 1.2.2.3

version 1.2.2.2, 2001/02/19 17:18:48 version 1.2.2.3, 2001/03/21 19:46:24
Line 1 
Line 1 
   /*      $OpenBSD$       */
   
   /*
    * Copyright (c) 2000 Markus Friedl.  All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
    * are met:
    * 1. Redistributions of source code must retain the above copyright
    *    notice, this list of conditions and the following disclaimer.
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in the
    *    documentation and/or other materials provided with the distribution.
    *
    * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
    * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
    * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
    * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
    * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
    * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
    * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
    * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    */
   
 #include "includes.h"  #include "includes.h"
 RCSID("$OpenBSD$");  RCSID("$OpenBSD$");
   
Line 110 
Line 136 
 {  {
         char ch = 0;          char ch = 0;
         int i = 0;          int i = 0;
           int n;
   
         if (!echo)          if (!echo)
                 cli_echo_disable();                  cli_echo_disable();
   
         while (ch != '\n') {          while (ch != '\n') {
                 if (read(cli_input, &ch, 1) != 1)                  n = read(cli_input, &ch, 1);
                   if (n == -1 && (errno == EAGAIN || errno == EINTR))
                           continue;
                   if (n != 1)
                         break;                          break;
                 if (ch == '\n' || intr != 0)                  if (ch == '\n' || intr != 0)
                         break;                          break;
Legend:
Removed from v.1.2.2.2  
changed lines
  Added in v.1.2.2.3