plink : [U] uxplink uxcons NONSSH UXSSH be_all logging UXMISC signal ux_x11
-# psftp : [U] psftp uxsftp console UXSSH be_none SFTP UXMISC
+psftp : [U] psftp uxsftp uxcons UXSSH be_none SFTP UXMISC
PuTTY : [M] terminal wcwidth ldiscucs logging be_all mac macdlg macevlog
+ macterm macucs mac_res.rsrc testback NONSSH MACSSH MACMISC CHARSET
default:
printf("chmod: file mode '%.*s' contains unrecognised"
" user/group/other specifier '%c'\n",
- strcspn(modebegin, ","), modebegin, *mode);
+ (int)strcspn(modebegin, ","), modebegin, *mode);
return 0;
}
mode++;
}
if (!*mode || *mode == ',') {
printf("chmod: file mode '%.*s' is incomplete\n",
- strcspn(modebegin, ","), modebegin);
+ (int)strcspn(modebegin, ","), modebegin);
return 0;
}
action = *mode++;
if (!*mode || *mode == ',') {
printf("chmod: file mode '%.*s' is incomplete\n",
- strcspn(modebegin, ","), modebegin);
+ (int)strcspn(modebegin, ","), modebegin);
return 0;
}
perms = 0;
(subset & 06777) != 02070) {
printf("chmod: file mode '%.*s': set[ug]id bit should"
" be used with exactly one of u or g only\n",
- strcspn(modebegin, ","), modebegin);
+ (int)strcspn(modebegin, ","), modebegin);
return 0;
}
perms |= 06000;
default:
printf("chmod: file mode '%.*s' contains unrecognised"
" permission specifier '%c'\n",
- strcspn(modebegin, ","), modebegin, *mode);
+ (int)strcspn(modebegin, ","), modebegin, *mode);
return 0;
}
mode++;
if (!(subset & 06777) && (perms &~ subset)) {
printf("chmod: file mode '%.*s' contains no user/group/other"
" specifier and permissions other than 't' \n",
- strcspn(modebegin, ","), modebegin);
+ (int)strcspn(modebegin, ","), modebegin);
return 0;
}
perms &= subset;
{
char *host, *realhost;
const char *err;
+ void *logctx;
/* Separate host and username */
host = userhost;
char *batchfile = NULL;
int errors = 0;
- flags = FLAG_STDERR | FLAG_INTERACTIVE | FLAG_SYNCAGENT;
+ flags = FLAG_STDERR | FLAG_INTERACTIVE
+#ifdef FLAG_SYNCAGENT
+ | FLAG_SYNCAGENT
+#endif
+ ;
cmdline_tooltype = TOOLTYPE_FILETRANSFER;
ssh_get_line = &console_get_line;
sk_init();
*/\r
int ssh_sftp_loop_iteration(void);\r
\r
+/*\r
+ * The main program in psftp.c. Called from main() in the platform-\r
+ * specific code, after doing any platform-specific initialisation.\r
+ */\r
+int psftp_main(int argc, char *argv[]);\r
+\r
#endif /* PUTTY_PSFTP_H */\r
sftp_pkt_addbyte(pkt, (unsigned char) pkt_type);
return pkt;
}
+/*
static void sftp_pkt_addbool(struct sftp_packet *pkt, unsigned char value)
{
sftp_pkt_adddata(pkt, &value, 1);
}
+*/
static void sftp_pkt_adduint32(struct sftp_packet *pkt,
unsigned long value)
{
static struct sftp_request *sftp_alloc_request(void)
{
- const unsigned CHANNEL_NUMBER_OFFSET = 256;
unsigned low, high, mid;
int tsize;
struct sftp_request *r;
* B-tree to find the largest ID which is in a contiguous
* sequence from the beginning. (Precisely everything in that
* sequence must have ID equal to its tree index plus
- * SEQUENCE_NUMBER_OFFSET.)
+ * REQUEST_ID_OFFSET.)
*/
tsize = count234(sftp_requests);
Makefile.gtk Makefile
local
-plink pterm putty puttytel
+plink pterm putty puttytel psftp
*.log
#define WCHAR wchar_t
#define BYTE unsigned char
-GLOBAL void *logctx;
-
/* Things pty.c needs from pterm.c */
char *get_x_display(void *frontend);
int font_dimension(void *frontend, int which);/* 0 for width, 1 for height */
*/
int sk_getxdmdata(void *sock, unsigned long *ip, int *port);
+/*
+ * General helpful Unix stuff: more helpful version of the FD_SET
+ * macro, which also handles maxfd.
+ */
+#define FD_SET_MAX(fd, max, set) do { \
+ FD_SET(fd, &set); \
+ if (max < fd + 1) max = fd + 1; \
+} while (0)
+
#endif
int console_batch_mode = FALSE;
+static void *console_logctx = NULL;
+
/*
* Clean up and exit.
*/
fputs(message, stderr);
}
+void console_provide_logctx(void *logctx)
+{
+ console_logctx = logctx;
+}
+
void logevent(void *frontend, const char *string)
{
- log_eventlog(logctx, string);
+ if (console_logctx)
+ log_eventlog(console_logctx, string);
}
int console_get_line(const char *prompt, char *str,
#include <pwd.h>
#include <sys/ioctl.h>
-/* More helpful version of the FD_SET macro, to also handle maxfd. */
-#define FD_SET_MAX(fd, max, set) do { \
- FD_SET(fd, &set); \
- if (max < fd + 1) max = fd + 1; \
-} while (0)
-
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
#include "putty.h"
#include "storage.h"
int connopen;
int exitcode;
int errors;
- void *ldisc;
+ void *ldisc, *logctx;
ssh_get_line = console_get_line;
* Start up the connection.
*/
logctx = log_init(NULL, &cfg);
+ console_provide_logctx(logctx);
{
const char *error;
char *realhost;
--- /dev/null
+/*\r
+ * uxsftp.c: the Unix-specific parts of PSFTP.\r
+ */\r
+\r
+#include <sys/time.h>\r
+#include <sys/types.h>\r
+#include <unistd.h>\r
+#include <errno.h>\r
+#include <pwd.h>\r
+\r
+#include "putty.h"\r
+#include "psftp.h"\r
+\r
+/*\r
+ * In PSFTP our selects are synchronous, so these functions are\r
+ * empty stubs.\r
+ */\r
+int uxsel_input_add(int fd, int rwx) { return 0; }\r
+void uxsel_input_remove(int id) { }\r
+\r
+char *x_get_default(const char *key)\r
+{\r
+ return NULL; /* this is a stub */\r
+}\r
+\r
+void platform_get_x11_auth(char *display, int *protocol,\r
+ unsigned char *data, int *datalen)\r
+{\r
+ /* Do nothing, therefore no auth. */\r
+}\r
+\r
+/*\r
+ * Default settings that are specific to PSFTP.\r
+ */\r
+char *platform_default_s(const char *name)\r
+{\r
+ if (!strcmp(name, "UserName")) {\r
+ /*\r
+ * Remote login username will default to the local username.\r
+ */\r
+ struct passwd *p;\r
+ uid_t uid = getuid();\r
+ char *user, *ret = NULL;\r
+\r
+ /*\r
+ * First, find who we think we are using getlogin. If this\r
+ * agrees with our uid, we'll go along with it. This should\r
+ * allow sharing of uids between several login names whilst\r
+ * coping correctly with people who have su'ed.\r
+ */\r
+ user = getlogin();\r
+ setpwent();\r
+ if (user)\r
+ p = getpwnam(user);\r
+ else\r
+ p = NULL;\r
+ if (p && p->pw_uid == uid) {\r
+ /*\r
+ * The result of getlogin() really does correspond to\r
+ * our uid. Fine.\r
+ */\r
+ ret = user;\r
+ } else {\r
+ /*\r
+ * If that didn't work, for whatever reason, we'll do\r
+ * the simpler version: look up our uid in the password\r
+ * file and map it straight to a name.\r
+ */\r
+ p = getpwuid(uid);\r
+ ret = p->pw_name;\r
+ }\r
+ endpwent();\r
+\r
+ return ret;\r
+ }\r
+ return NULL;\r
+}\r
+\r
+int platform_default_i(const char *name, int def)\r
+{\r
+ return def;\r
+}\r
+\r
+FontSpec platform_default_fontspec(const char *name)\r
+{\r
+ FontSpec ret;\r
+ *ret.name = '\0';\r
+ return ret;\r
+}\r
+\r
+Filename platform_default_filename(const char *name)\r
+{\r
+ Filename ret;\r
+ if (!strcmp(name, "LogFileName"))\r
+ strcpy(ret.path, "putty.log");\r
+ else\r
+ *ret.path = '\0';\r
+ return ret;\r
+}\r
+\r
+/*\r
+ * Set local current directory. Returns NULL on success, or else an\r
+ * error message which must be freed after printing.\r
+ */\r
+char *psftp_lcd(char *dir)\r
+{\r
+ if (chdir(dir) < 0)\r
+ return dupprintf("%s: chdir: %s", dir, strerror(errno));\r
+ else\r
+ return NULL;\r
+}\r
+\r
+/*\r
+ * Get local current directory. Returns a string which must be\r
+ * freed.\r
+ */\r
+char *psftp_getcwd(void)\r
+{\r
+ char *buffer, *ret;\r
+ int size = 256;\r
+\r
+ buffer = snewn(size, char);\r
+ while (1) {\r
+ ret = getcwd(buffer, size);\r
+ if (ret != NULL)\r
+ return ret;\r
+ if (errno != ERANGE) {\r
+ sfree(buffer);\r
+ return dupprintf("[cwd unavailable: %s]", strerror(errno));\r
+ }\r
+ /*\r
+ * Otherwise, ERANGE was returned, meaning the buffer\r
+ * wasn't big enough.\r
+ */\r
+ size = size * 3 / 2;\r
+ buffer = sresize(buffer, size, char);\r
+ }\r
+}\r
+\r
+/*\r
+ * Wait for some network data and process it.\r
+ */\r
+int ssh_sftp_loop_iteration(void)\r
+{\r
+ fd_set rset, wset, xset;\r
+ int i, fdcount, fdsize, *fdlist;\r
+ int fd, fdstate, rwx, ret, maxfd;\r
+\r
+ fdlist = NULL;\r
+ fdcount = fdsize = 0;\r
+\r
+ /* Count the currently active fds. */\r
+ i = 0;\r
+ for (fd = first_fd(&fdstate, &rwx); fd >= 0;\r
+ fd = next_fd(&fdstate, &rwx)) i++;\r
+\r
+ if (i < 1)\r
+ return -1; /* doom */\r
+\r
+ /* Expand the fdlist buffer if necessary. */\r
+ if (i > fdsize) {\r
+ fdsize = i + 16;\r
+ fdlist = sresize(fdlist, fdsize, int);\r
+ }\r
+\r
+ FD_ZERO(&rset);\r
+ FD_ZERO(&wset);\r
+ FD_ZERO(&xset);\r
+ maxfd = 0;\r
+\r
+ /*\r
+ * Add all currently open fds to the select sets, and store\r
+ * them in fdlist as well.\r
+ */\r
+ fdcount = 0;\r
+ for (fd = first_fd(&fdstate, &rwx); fd >= 0;\r
+ fd = next_fd(&fdstate, &rwx)) {\r
+ fdlist[fdcount++] = fd;\r
+ if (rwx & 1)\r
+ FD_SET_MAX(fd, maxfd, rset);\r
+ if (rwx & 2)\r
+ FD_SET_MAX(fd, maxfd, wset);\r
+ if (rwx & 4)\r
+ FD_SET_MAX(fd, maxfd, xset);\r
+ }\r
+\r
+ do {\r
+ ret = select(maxfd, &rset, &wset, &xset, NULL);\r
+ } while (ret < 0 && errno == EINTR);\r
+\r
+ if (ret < 0) {\r
+ perror("select");\r
+ exit(1);\r
+ }\r
+\r
+ for (i = 0; i < fdcount; i++) {\r
+ fd = fdlist[i];\r
+ /*\r
+ * We must process exceptional notifications before\r
+ * ordinary readability ones, or we may go straight\r
+ * past the urgent marker.\r
+ */\r
+ if (FD_ISSET(fd, &xset))\r
+ select_result(fd, 4);\r
+ if (FD_ISSET(fd, &rset))\r
+ select_result(fd, 1);\r
+ if (FD_ISSET(fd, &wset))\r
+ select_result(fd, 2);\r
+ }\r
+\r
+ sfree(fdlist);\r
+\r
+ return 0;\r
+}\r
+\r
+/*\r
+ * Main program: do platform-specific initialisation and then call\r
+ * psftp_main().\r
+ */\r
+int main(int argc, char *argv[])\r
+{\r
+ uxsel_init();\r
+ return psftp_main(argc, argv);\r
+}\r
projects / u / mdw / putty / commitdiff