summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorswallace <swallace@FreeBSD.org>1994-10-25 20:50:41 +0000
committerswallace <swallace@FreeBSD.org>1994-10-25 20:50:41 +0000
commit24c2aab3285c8eab2581e492596926e26b6d002e (patch)
tree64c9b1070959bab6ff5504ce4176ca94c2950735
parent10fb081e1d1065cc28c083ae3a1a2dcc6c83c001 (diff)
downloadFreeBSD-src-24c2aab3285c8eab2581e492596926e26b6d002e.zip
FreeBSD-src-24c2aab3285c8eab2581e492596926e26b6d002e.tar.gz
Applied patch009. Also added appropriate #include <string.h> which
would have detected that memset was not being passed a pointer in the first place. Submitted by: Gene Stark (?) - 1.1.5.1 patch009
-rw-r--r--usr.sbin/kbdcontrol/kbdcontrol.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index cda976b..24349ae 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -24,11 +24,12 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: kbdcontrol.c,v 1.1 1994/05/20 12:18:05 sos Exp $
+ * $Id: kbdcontrol.c,v 1.1 1994/08/17 08:59:34 sos Exp $
*/
#include <ctype.h>
#include <stdio.h>
+#include <string.h>
#include <machine/console.h>
#include "path.h"
#include "lex.h"
@@ -335,7 +336,7 @@ load_keymap(char *opt)
perror("keymap file not found");
return;
}
- memset(map, 0, sizeof(map));
+ memset(&map, 0, sizeof(map));
while (1) {
if ((scancode = get_key_definition_line(fd, &map)) < 0)
break;
OpenPOWER on IntegriCloud