mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-15 10:17:20 +00:00
Minor cleanup, adjust for latest version of apache web server.
This commit is contained in:
parent
37c16c5340
commit
2bd4114e2a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=21765
@ -332,7 +332,7 @@ whichMouse(dialogMenuItem *self)
|
||||
|
||||
if (!file_readable("/dev/mouse"))
|
||||
return FALSE;
|
||||
if (readlink("/dev/mouse", buf, BUFSIZ) == -1)
|
||||
if (readlink("/dev/mouse", buf, sizeof buf) == -1)
|
||||
return FALSE;
|
||||
if (!strcmp(self->prompt, "COM1"))
|
||||
return !strcmp(buf, "/dev/cuaa0");
|
||||
@ -369,7 +369,7 @@ DMenu MenuMouse = {
|
||||
"ln -fs /dev/cuaa2 /dev/mouse", '(', '*', ')', 1 },
|
||||
{ "COM4", "Serial mouse on COM4", whichMouse, dmenuSystemCommand, NULL,
|
||||
"ln -fs /dev/cuaa3 /dev/mouse", '(', '*', ')', 1 },
|
||||
{ "BusMouse", "Logitech or ATI bus mouse", whichMouse, dmenuSystemCommand, NULL,
|
||||
{ "BusMouse", "Logitech or ATI bus mouse", whichMouse, dmenuSystemCommand, NULL,
|
||||
"ln -fs /dev/mse0 /dev/mouse", '(', '*', ')', 1 },
|
||||
{ "PS/2", "PS/2 style mouse (must enable psm0 device)", whichMouse, dmenuSystemCommand, NULL,
|
||||
"ln -fs /dev/psm0 /dev/mouse", '(', '*', ')', 1 },
|
||||
|
@ -56,7 +56,7 @@
|
||||
|
||||
/* Different packages we depend on - update this when package version change! */
|
||||
#define PACKAGE_GATED "gated-3.5b3"
|
||||
#define PACKAGE_APACHE "apache-1.1.1"
|
||||
#define PACKAGE_APACHE "apache-1.2b4"
|
||||
#define PACKAGE_NETCON "commerce/netcon/bsd61"
|
||||
#define PACKAGE_PCNFSD "pcnfsd-93.02.16"
|
||||
#define PACKAGE_SAMBA "samba-1.9.15p8"
|
||||
|
@ -42,7 +42,6 @@ static void
|
||||
make_variable(char *var, char *value)
|
||||
{
|
||||
Variable *vp;
|
||||
char *cp;
|
||||
|
||||
/* Trim leading and trailing whitespace */
|
||||
var = string_skipwhite(string_prune(var));
|
||||
|
@ -332,7 +332,7 @@ whichMouse(dialogMenuItem *self)
|
||||
|
||||
if (!file_readable("/dev/mouse"))
|
||||
return FALSE;
|
||||
if (readlink("/dev/mouse", buf, BUFSIZ) == -1)
|
||||
if (readlink("/dev/mouse", buf, sizeof buf) == -1)
|
||||
return FALSE;
|
||||
if (!strcmp(self->prompt, "COM1"))
|
||||
return !strcmp(buf, "/dev/cuaa0");
|
||||
@ -369,7 +369,7 @@ DMenu MenuMouse = {
|
||||
"ln -fs /dev/cuaa2 /dev/mouse", '(', '*', ')', 1 },
|
||||
{ "COM4", "Serial mouse on COM4", whichMouse, dmenuSystemCommand, NULL,
|
||||
"ln -fs /dev/cuaa3 /dev/mouse", '(', '*', ')', 1 },
|
||||
{ "BusMouse", "Logitech or ATI bus mouse", whichMouse, dmenuSystemCommand, NULL,
|
||||
{ "BusMouse", "Logitech or ATI bus mouse", whichMouse, dmenuSystemCommand, NULL,
|
||||
"ln -fs /dev/mse0 /dev/mouse", '(', '*', ')', 1 },
|
||||
{ "PS/2", "PS/2 style mouse (must enable psm0 device)", whichMouse, dmenuSystemCommand, NULL,
|
||||
"ln -fs /dev/psm0 /dev/mouse", '(', '*', ')', 1 },
|
||||
|
@ -56,7 +56,7 @@
|
||||
|
||||
/* Different packages we depend on - update this when package version change! */
|
||||
#define PACKAGE_GATED "gated-3.5b3"
|
||||
#define PACKAGE_APACHE "apache-1.1.1"
|
||||
#define PACKAGE_APACHE "apache-1.2b4"
|
||||
#define PACKAGE_NETCON "commerce/netcon/bsd61"
|
||||
#define PACKAGE_PCNFSD "pcnfsd-93.02.16"
|
||||
#define PACKAGE_SAMBA "samba-1.9.15p8"
|
||||
|
@ -42,7 +42,6 @@ static void
|
||||
make_variable(char *var, char *value)
|
||||
{
|
||||
Variable *vp;
|
||||
char *cp;
|
||||
|
||||
/* Trim leading and trailing whitespace */
|
||||
var = string_skipwhite(string_prune(var));
|
||||
|
@ -332,7 +332,7 @@ whichMouse(dialogMenuItem *self)
|
||||
|
||||
if (!file_readable("/dev/mouse"))
|
||||
return FALSE;
|
||||
if (readlink("/dev/mouse", buf, BUFSIZ) == -1)
|
||||
if (readlink("/dev/mouse", buf, sizeof buf) == -1)
|
||||
return FALSE;
|
||||
if (!strcmp(self->prompt, "COM1"))
|
||||
return !strcmp(buf, "/dev/cuaa0");
|
||||
@ -369,7 +369,7 @@ DMenu MenuMouse = {
|
||||
"ln -fs /dev/cuaa2 /dev/mouse", '(', '*', ')', 1 },
|
||||
{ "COM4", "Serial mouse on COM4", whichMouse, dmenuSystemCommand, NULL,
|
||||
"ln -fs /dev/cuaa3 /dev/mouse", '(', '*', ')', 1 },
|
||||
{ "BusMouse", "Logitech or ATI bus mouse", whichMouse, dmenuSystemCommand, NULL,
|
||||
{ "BusMouse", "Logitech or ATI bus mouse", whichMouse, dmenuSystemCommand, NULL,
|
||||
"ln -fs /dev/mse0 /dev/mouse", '(', '*', ')', 1 },
|
||||
{ "PS/2", "PS/2 style mouse (must enable psm0 device)", whichMouse, dmenuSystemCommand, NULL,
|
||||
"ln -fs /dev/psm0 /dev/mouse", '(', '*', ')', 1 },
|
||||
|
@ -56,7 +56,7 @@
|
||||
|
||||
/* Different packages we depend on - update this when package version change! */
|
||||
#define PACKAGE_GATED "gated-3.5b3"
|
||||
#define PACKAGE_APACHE "apache-1.1.1"
|
||||
#define PACKAGE_APACHE "apache-1.2b4"
|
||||
#define PACKAGE_NETCON "commerce/netcon/bsd61"
|
||||
#define PACKAGE_PCNFSD "pcnfsd-93.02.16"
|
||||
#define PACKAGE_SAMBA "samba-1.9.15p8"
|
||||
|
@ -42,7 +42,6 @@ static void
|
||||
make_variable(char *var, char *value)
|
||||
{
|
||||
Variable *vp;
|
||||
char *cp;
|
||||
|
||||
/* Trim leading and trailing whitespace */
|
||||
var = string_skipwhite(string_prune(var));
|
||||
|
Loading…
Reference in New Issue
Block a user