Deleted Added
full compact
passphrase.c (302075) passphrase.c (302294)
1/*-
2 * Copyright (c) 2014 Michihiro NAKAJIMA
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

43 * Agency (DARPA) and Air Force Research Laboratory, Air Force
44 * Materiel Command, USAF, under agreement number F39502-99-1-0512.
45 */
46
47/* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */
48
49
50#include "lafe_platform.h"
1/*-
2 * Copyright (c) 2014 Michihiro NAKAJIMA
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

43 * Agency (DARPA) and Air Force Research Laboratory, Air Force
44 * Materiel Command, USAF, under agreement number F39502-99-1-0512.
45 */
46
47/* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */
48
49
50#include "lafe_platform.h"
51__FBSDID("$FreeBSD: head/contrib/libarchive/libarchive_fe/passphrase.c 302075 2016-06-22 07:49:59Z mm $");
51__FBSDID("$FreeBSD: head/contrib/libarchive/libarchive_fe/passphrase.c 302294 2016-06-30 08:51:50Z mm $");
52
53#include <errno.h>
54#ifdef HAVE_STDLIB_H
55#include <stdlib.h>
56#endif
57#ifdef HAVE_UNISTD_H
58#include <unistd.h>
59#endif

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

127#ifdef HAVE_PATHS_H
128#include <paths.h>
129#endif
130#include <signal.h>
131#include <string.h>
132#include <termios.h>
133#include <unistd.h>
134
52
53#include <errno.h>
54#ifdef HAVE_STDLIB_H
55#include <stdlib.h>
56#endif
57#ifdef HAVE_UNISTD_H
58#include <unistd.h>
59#endif

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

127#ifdef HAVE_PATHS_H
128#include <paths.h>
129#endif
130#include <signal.h>
131#include <string.h>
132#include <termios.h>
133#include <unistd.h>
134
135#ifndef _PATH_TTY
136#define _PATH_TTY "/dev/tty"
137#endif
138
135#ifdef TCSASOFT
136# define _T_FLUSH (TCSAFLUSH|TCSASOFT)
137#else
138# define _T_FLUSH (TCSAFLUSH)
139#endif
140
141/* SunOS 4.x which lacks _POSIX_VDISABLE, but has VDISABLE */
142#if !defined(_POSIX_VDISABLE) && defined(VDISABLE)

--- 180 unchanged lines hidden ---
139#ifdef TCSASOFT
140# define _T_FLUSH (TCSAFLUSH|TCSASOFT)
141#else
142# define _T_FLUSH (TCSAFLUSH)
143#endif
144
145/* SunOS 4.x which lacks _POSIX_VDISABLE, but has VDISABLE */
146#if !defined(_POSIX_VDISABLE) && defined(VDISABLE)

--- 180 unchanged lines hidden ---