| sftp-server.c (294336) | sftp-server.c (294496) |
|---|---|
| 1/* $OpenBSD: sftp-server.c,v 1.106 2015/04/24 01:36:01 deraadt Exp $ */ | 1/* $OpenBSD: sftp-server.c,v 1.107 2015/08/20 22:32:42 deraadt Exp $ */ |
| 2/* 3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. 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 --- 1617 unchanged lines hidden (view full) --- 1627 max = out; 1628 1629 if ((iqueue = sshbuf_new()) == NULL) 1630 fatal("%s: sshbuf_new failed", __func__); 1631 if ((oqueue = sshbuf_new()) == NULL) 1632 fatal("%s: sshbuf_new failed", __func__); 1633 1634 set_size = howmany(max + 1, NFDBITS) * sizeof(fd_mask); | 2/* 3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. 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 --- 1617 unchanged lines hidden (view full) --- 1627 max = out; 1628 1629 if ((iqueue = sshbuf_new()) == NULL) 1630 fatal("%s: sshbuf_new failed", __func__); 1631 if ((oqueue = sshbuf_new()) == NULL) 1632 fatal("%s: sshbuf_new failed", __func__); 1633 1634 set_size = howmany(max + 1, NFDBITS) * sizeof(fd_mask); |
| 1635 rset = (fd_set *)xmalloc(set_size); 1636 wset = (fd_set *)xmalloc(set_size); | 1635 rset = xmalloc(set_size); 1636 wset = xmalloc(set_size); |
| 1637 1638 if (homedir != NULL) { 1639 if (chdir(homedir) != 0) { 1640 error("chdir to \"%s\" failed: %s", homedir, 1641 strerror(errno)); 1642 } 1643 } 1644 --- 67 unchanged lines hidden --- | 1637 1638 if (homedir != NULL) { 1639 if (chdir(homedir) != 0) { 1640 error("chdir to \"%s\" failed: %s", homedir, 1641 strerror(errno)); 1642 } 1643 } 1644 --- 67 unchanged lines hidden --- |