Deleted Added
full compact
sftp.c (146998) sftp.c (147001)
1/*
2 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
3 *
4 * Permission to use, copy, modify, and distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */
16
17#include "includes.h"
18
1/*
2 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
3 *
4 * Permission to use, copy, modify, and distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */
16
17#include "includes.h"
18
19RCSID("$OpenBSD: sftp.c,v 1.62 2005/02/20 22:59:06 djm Exp $");
19RCSID("$OpenBSD: sftp.c,v 1.63 2005/03/10 22:01:05 deraadt Exp $");
20
21#ifdef USE_LIBEDIT
22#include <histedit.h>
23#else
24typedef void EditLine;
25#endif
26
27#include "buffer.h"

--- 324 unchanged lines hidden (view full) ---

352{
353 const char *cp = *cpp;
354
355 /* Defaults */
356 *lflag = LS_NAME_SORT;
357
358 /* Check for flags */
359 if (cp++[0] == '-') {
20
21#ifdef USE_LIBEDIT
22#include <histedit.h>
23#else
24typedef void EditLine;
25#endif
26
27#include "buffer.h"

--- 324 unchanged lines hidden (view full) ---

352{
353 const char *cp = *cpp;
354
355 /* Defaults */
356 *lflag = LS_NAME_SORT;
357
358 /* Check for flags */
359 if (cp++[0] == '-') {
360 for(; strchr(WHITESPACE, *cp) == NULL; cp++) {
360 for (; strchr(WHITESPACE, *cp) == NULL; cp++) {
361 switch (*cp) {
362 case 'l':
363 *lflag &= ~VIEW_FLAGS;
364 *lflag |= LS_LONG_VIEW;
365 break;
366 case '1':
367 *lflag &= ~VIEW_FLAGS;
368 *lflag |= LS_SHORT_VIEW;

--- 1211 unchanged lines hidden ---
361 switch (*cp) {
362 case 'l':
363 *lflag &= ~VIEW_FLAGS;
364 *lflag |= LS_LONG_VIEW;
365 break;
366 case '1':
367 *lflag &= ~VIEW_FLAGS;
368 *lflag |= LS_SHORT_VIEW;

--- 1211 unchanged lines hidden ---