Imported Upstream version 2.6.4
This commit is contained in:
Arnaud Quette
parent
fad6ced6f6
commit
fefe62b2bd
257 changed files with 6020 additions and 1394 deletions
|
|
@ -26,3 +26,9 @@ nut_version.h: FORCE
|
|||
-rm -f _nut_version.h
|
||||
|
||||
FORCE:
|
||||
|
||||
# counter part of BUILT_SOURCES: since nut_version is not a direct
|
||||
# deps of a local target, we must clean it by ourself before the
|
||||
# distribution
|
||||
dist-hook:
|
||||
rm -f $(distdir)/nut_version.h
|
||||
|
|
|
|||
|
|
@ -149,6 +149,7 @@ MKDIR_P = @MKDIR_P@
|
|||
NETLIBS = @NETLIBS@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUT_NETVERSION = @NUT_NETVERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OS_NAME = @OS_NAME@
|
||||
|
|
@ -162,6 +163,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|||
PACKAGE_URL = @PACKAGE_URL@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PIDPATH = @PIDPATH@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
|
|
@ -169,6 +171,7 @@ PORT = @PORT@
|
|||
RANLIB = @RANLIB@
|
||||
RUN_AS_GROUP = @RUN_AS_GROUP@
|
||||
RUN_AS_USER = @RUN_AS_USER@
|
||||
SBINDIR = @SBINDIR@
|
||||
SED = @SED@
|
||||
SERLIBS = @SERLIBS@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
|
|
@ -343,6 +346,9 @@ distdir: $(DISTFILES)
|
|||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
$(MAKE) $(AM_MAKEFLAGS) \
|
||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||
dist-hook
|
||||
check-am: all-am
|
||||
check: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) check-am
|
||||
|
|
@ -445,9 +451,9 @@ uninstall-am:
|
|||
.MAKE: all check install install-am install-strip
|
||||
|
||||
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
|
||||
distclean distclean-generic distclean-hdr distclean-libtool \
|
||||
distdir dvi dvi-am html html-am info info-am install \
|
||||
install-am install-data install-data-am install-dvi \
|
||||
dist-hook distclean distclean-generic distclean-hdr \
|
||||
distclean-libtool distdir dvi dvi-am html html-am info info-am \
|
||||
install install-am install-data install-data-am install-dvi \
|
||||
install-dvi-am install-exec install-exec-am install-html \
|
||||
install-html-am install-info install-info-am install-man \
|
||||
install-pdf install-pdf-am install-ps install-ps-am \
|
||||
|
|
@ -479,6 +485,12 @@ nut_version.h: FORCE
|
|||
|
||||
FORCE:
|
||||
|
||||
# counter part of BUILT_SOURCES: since nut_version is not a direct
|
||||
# deps of a local target, we must clean it by ourself before the
|
||||
# distribution
|
||||
dist-hook:
|
||||
rm -f $(distdir)/nut_version.h
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
|
|
|||
|
|
@ -112,6 +112,7 @@ void *xrealloc(void *ptr, size_t size);
|
|||
char *xstrdup(const char *string);
|
||||
|
||||
char *rtrim(char *in, const char sep);
|
||||
char* ltrim(char *in, const char sep);
|
||||
|
||||
int select_read(const int fd, void *buf, const size_t buflen, const long d_sec, const long d_usec);
|
||||
int select_write(const int fd, const void *buf, const size_t buflen, const long d_sec, const long d_usec);
|
||||
|
|
|
|||
|
|
@ -291,6 +291,9 @@
|
|||
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
|
||||
#undef NO_MINUS_C_MINUS_O
|
||||
|
||||
/* NUT network protocol version */
|
||||
#undef NUT_NETVERSION
|
||||
|
||||
/* Name of package */
|
||||
#undef PACKAGE
|
||||
|
||||
|
|
@ -324,6 +327,9 @@
|
|||
/* User to switch to if started as root */
|
||||
#undef RUN_AS_USER
|
||||
|
||||
/* Default path for system executables */
|
||||
#undef SBINDIR
|
||||
|
||||
/* Path for UPS driver state files */
|
||||
#undef STATEPATH
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,13 @@ typedef struct enum_s {
|
|||
struct enum_s *next;
|
||||
} enum_t;
|
||||
|
||||
/* RANGE boundaries */
|
||||
typedef struct range_s {
|
||||
int min;
|
||||
int max;
|
||||
struct range_s *next;
|
||||
} range_t;
|
||||
|
||||
/* list of instant commands */
|
||||
typedef struct cmdlist_s {
|
||||
char *name;
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
/* Autogenerated file. Do not change. */
|
||||
/* This file was generated by "make". */
|
||||
#define NUT_VERSION_MACRO "2.6.3-3369:3371"
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
/* state.h - Network UPS Tools common state management functions
|
||||
|
||||
Copyright (C) 2003 Russell Kroll <rkroll@exploits.org>
|
||||
Copyright (C)
|
||||
2003 Russell Kroll <rkroll@exploits.org>
|
||||
2012 Arnaud Quette <arnaud.quette@free.fr>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -38,6 +40,7 @@ typedef struct st_tree_s {
|
|||
int aux;
|
||||
|
||||
struct enum_s *enum_list;
|
||||
struct range_s *range_list;
|
||||
|
||||
struct st_tree_s *left;
|
||||
struct st_tree_s *right;
|
||||
|
|
@ -45,11 +48,13 @@ typedef struct st_tree_s {
|
|||
|
||||
int state_setinfo(st_tree_t **nptr, const char *var, const char *val);
|
||||
int state_addenum(st_tree_t *root, const char *var, const char *val);
|
||||
int state_addrange(st_tree_t *root, const char *var, const int min, const int max);
|
||||
int state_setaux(st_tree_t *root, const char *var, const char *auxs);
|
||||
const char *state_getinfo(st_tree_t *root, const char *var);
|
||||
int state_getflags(st_tree_t *root, const char *var);
|
||||
int state_getaux(st_tree_t *root, const char *var);
|
||||
const enum_t *state_getenumlist(st_tree_t *root, const char *var);
|
||||
const range_t *state_getrangelist(st_tree_t *root, const char *var);
|
||||
void state_setflags(st_tree_t *root, const char *var, int numflags, char **flags);
|
||||
int state_addcmd(cmdlist_t **list, const char *cmd);
|
||||
void state_infofree(st_tree_t *node);
|
||||
|
|
@ -57,6 +62,7 @@ void state_cmdfree(cmdlist_t *list);
|
|||
int state_delcmd(cmdlist_t **list, const char *cmd);
|
||||
int state_delinfo(st_tree_t **root, const char *var);
|
||||
int state_delenum(st_tree_t *root, const char *var, const char *val);
|
||||
int state_delrange(st_tree_t *root, const char *var, const int min, const int max);
|
||||
st_tree_t *state_tree_find(st_tree_t *node, const char *var);
|
||||
|
||||
#endif /* STATE_H_SEEN */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue