| sftp.c (204917) | sftp.c (215116) |
|---|---|
| 1/* $OpenBSD: sftp.c,v 1.123 2010/01/27 19:21:39 djm Exp $ */ | 1/* $OpenBSD: sftp.c,v 1.125 2010/06/18 00:58:39 djm Exp $ */ |
| 2/* 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 4 * 5 * Permission to use, copy, modify, and distribute this software for any 6 * purpose with or without fee is hereby granted, provided that the above 7 * copyright notice and this permission notice appear in all copies. 8 * 9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES --- 166 unchanged lines hidden (view full) --- 176 { "lchdir", I_LCHDIR, LOCAL }, 177 { "lls", I_LLS, LOCAL }, 178 { "lmkdir", I_LMKDIR, LOCAL }, 179 { "ln", I_SYMLINK, REMOTE }, 180 { "lpwd", I_LPWD, LOCAL }, 181 { "ls", I_LS, REMOTE }, 182 { "lumask", I_LUMASK, NOARGS }, 183 { "mkdir", I_MKDIR, REMOTE }, | 2/* 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 4 * 5 * Permission to use, copy, modify, and distribute this software for any 6 * purpose with or without fee is hereby granted, provided that the above 7 * copyright notice and this permission notice appear in all copies. 8 * 9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES --- 166 unchanged lines hidden (view full) --- 176 { "lchdir", I_LCHDIR, LOCAL }, 177 { "lls", I_LLS, LOCAL }, 178 { "lmkdir", I_LMKDIR, LOCAL }, 179 { "ln", I_SYMLINK, REMOTE }, 180 { "lpwd", I_LPWD, LOCAL }, 181 { "ls", I_LS, REMOTE }, 182 { "lumask", I_LUMASK, NOARGS }, 183 { "mkdir", I_MKDIR, REMOTE }, |
| 184 { "mget", I_GET, REMOTE }, 185 { "mput", I_PUT, LOCAL }, |
|
| 184 { "progress", I_PROGRESS, NOARGS }, 185 { "put", I_PUT, LOCAL }, 186 { "pwd", I_PWD, REMOTE }, 187 { "quit", I_QUIT, NOARGS }, 188 { "rename", I_RENAME, REMOTE }, 189 { "rm", I_RM, REMOTE }, 190 { "rmdir", I_RMDIR, REMOTE }, 191 { "symlink", I_SYMLINK, REMOTE }, --- 1169 unchanged lines hidden (view full) --- 1361 err = 1; 1362 break; 1363 } 1364 xfree(*pwd); 1365 *pwd = tmp; 1366 break; 1367 case I_LS: 1368 if (!path1) { | 186 { "progress", I_PROGRESS, NOARGS }, 187 { "put", I_PUT, LOCAL }, 188 { "pwd", I_PWD, REMOTE }, 189 { "quit", I_QUIT, NOARGS }, 190 { "rename", I_RENAME, REMOTE }, 191 { "rm", I_RM, REMOTE }, 192 { "rmdir", I_RMDIR, REMOTE }, 193 { "symlink", I_SYMLINK, REMOTE }, --- 1169 unchanged lines hidden (view full) --- 1363 err = 1; 1364 break; 1365 } 1366 xfree(*pwd); 1367 *pwd = tmp; 1368 break; 1369 case I_LS: 1370 if (!path1) { |
| 1369 do_globbed_ls(conn, *pwd, *pwd, lflag); | 1371 do_ls_dir(conn, *pwd, *pwd, lflag); |
| 1370 break; 1371 } 1372 1373 /* Strip pwd off beginning of non-absolute paths */ 1374 tmp = NULL; 1375 if (*path1 != '/') 1376 tmp = *pwd; 1377 --- 888 unchanged lines hidden --- | 1372 break; 1373 } 1374 1375 /* Strip pwd off beginning of non-absolute paths */ 1376 tmp = NULL; 1377 if (*path1 != '/') 1378 tmp = *pwd; 1379 --- 888 unchanged lines hidden --- |