External/energymech
1
0
Fork 0
mirror of https://github.com/EnergyMech/energymech.git synced 2025-12-17 15:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

calc and hostinfo progress

Browse Source
This commit is contained in:
joonicks 2025-09-21 16:22:13 +02:00
parent e00dc6c57b
commit 4b614a4b82
2 changed files with 61 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/calc.c
View File

@ -1,7 +1,7 @@
/* /*
EnergyMech, IRC bot software EnergyMech, IRC bot software
Copyright (c) 2020-2021 proton Copyright (c) 2020-2024 proton
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -92,7 +92,9 @@ const char *calculate(const char *input, CalcOp *cop, char *prepin)
*dst = 0; *dst = 0;
input = prepin; input = prepin;
#ifdef TEST
printf("%s\n",prepin); printf("%s\n",prepin);
#endif /* TEST */
cop_count = 0; cop_count = 0;
maxdeci = 0; maxdeci = 0;
goto new_blank; goto new_blank;
@ -140,14 +142,21 @@ op_or_num:
input++; input++;
goto parse_num; goto parse_num;
} }
if (*input >= '0' && *input <= '9') if (*input == '*')
{
op = OPER_MUL;
input++;
para++;
goto parse_num;
}
if ((*input >= '0' && *input <= '9') || *input == '.')
goto parse_num; goto parse_num;
if (*input == 0) if (*input == 0)
goto new_op_or_num; goto new_op_or_num;
goto parsing_error; goto parsing_error;
parse_num: parse_num:
if (*input == '-' || *input == '+') if (*input == '-' || *input == '+' || *input == '*')
{ {
goto new_op_or_num; goto new_op_or_num;
} }
@ -176,7 +185,7 @@ parsing_error:
calculate_result: calculate_result:
x = 20; x = 20;
/* find most decimals and convert all other numbers */ /* find most decimals and convert all other numbers */
for(i=0;i<=cop_count;i++) /* for(i=0;i<=cop_count;i++)
{ {
if (cop[i].decimals < maxdeci) if (cop[i].decimals < maxdeci)
{ {
@ -188,6 +197,7 @@ calculate_result:
cop[i].decimals = maxdeci; cop[i].decimals = maxdeci;
} }
} }
*/
r = 0; r = 0;
iterate: iterate:
/* find highest paralevel */ /* find highest paralevel */
@ -195,7 +205,8 @@ iterate:
for(i=0;i<=cop_count;i++) for(i=0;i<=cop_count;i++)
{ {
if (cop[i].paralevel >= 0) if (cop[i].paralevel >= 0)
printf("number %lli, operation %i, decimals %i, paralevel %i\n",cop[i].number,cop[i].operation,cop[i].decimals,cop[i].paralevel); printf("number %lu, operation %i, decimals %i, paralevel %i\n",
cop[i].number,cop[i].operation,cop[i].decimals,cop[i].paralevel);
if (cop[i].paralevel >= para) if (cop[i].paralevel >= para)
para = cop[i].paralevel; para = cop[i].paralevel;
} }
@ -210,6 +221,18 @@ iterate:
r += cop[i].number; r += cop[i].number;
cop[i].paralevel = -1; cop[i].paralevel = -1;
} }
if (cop[i].paralevel == para && op == 2 && cop[i].operation == OPER_MUL)
{
cop[i-1].number = cop[i-1].number * cop[i].number;
/* if (cop[i-1].decimals > cop[i].decimals)*/
{
#ifdef TEST
printf("decimals adjust %i > %i\n",cop[i-1].decimals,cop[i].decimals);
#endif /* TEST */
/* cop[i-1].number /= decival[cop[i-1].decimals - cop[i].decimals];*/
}
cop[i].paralevel = -1;
}
} }
} }
if (x--<0) if (x--<0)
@ -232,21 +255,6 @@ return_result:
return(prepin); return(prepin);
} }
void do_calc(COMMAND_ARGS)
{
CalcOp cop[MAX_COP];
int cp = 0;
memset(&cop,0,sizeof(cop));
/* start with a numeral, or '-' */
if (*rest != '-' && (attrtab[(uchar)*rest] & NUM) == 0)
{
/* malformed */
return;
}
}
void mkbin(char *dst, int num, int bits) void mkbin(char *dst, int num, int bits)
{ {
int lim; int lim;
@ -317,6 +325,23 @@ int bas2int(const char *src, int base)
#if !defined(TEST) #if !defined(TEST)
void do_calc(COMMAND_ARGS)
{
char prep[MSGLEN];
CalcOp cop[MAX_COP];
int cp = 0;
memset(&cop,0,sizeof(cop));
/* start with a numeral, or '.', or '-' */
if (*rest != '-' && *rest != '.' && (attrtab[(uchar)*rest] & NUM) == 0)
{
/* malformed */
return;
}
to_user_q(from,"%s",calculate(rest,cop,prep));
}
void do_convert(COMMAND_ARGS) void do_convert(COMMAND_ARGS)
{ {
char output[200]; char output[200];
@ -416,7 +441,7 @@ void do_convert(COMMAND_ARGS)
if (dst != output) if (dst != output)
*(dst++) = ' '; *(dst++) = ' ';
sprintf(dst,"oct 0%o",num,num); sprintf(dst,"oct 0%o",num);
} }
if (tohex) if (tohex)
@ -461,8 +486,11 @@ void do_convert(COMMAND_ARGS)
const char *test[] = { const char *test[] = {
"1 - .2 + .03 - .004", "1 - .2 + .03 - .004",
"2.008 + 9 + .992", "2.008 + 9 + .992",
/* "999 - 555.66", "999 - 555.66",
"1+2-3+4-5+6-7+8-9",*/ "1+2-3+4-5+6-7+8-9",
"100*200",
"10-10*10+10",
".001*1000",
NULL NULL
}; };
@ -470,7 +498,6 @@ int main(int argc, char **argv, char **envp)
{ {
char prep[MSGLEN]; char prep[MSGLEN];
CalcOp cop[MAX_COP]; CalcOp cop[MAX_COP];
char *tmp;
int i; int i;
for(i=0;test[i];i++) for(i=0;test[i];i++)

27
src/hostinfo.c
View File

@ -1,7 +1,7 @@
/* /*
EnergyMech, IRC bot software EnergyMech, IRC bot software
Copyright (c) 2020 proton Copyright (c) 2020-2024 proton
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -141,7 +141,7 @@ int parse_proc_status(char *line)
key = chop(&line); key = chop(&line);
#ifdef DEBUG #ifdef DEBUG
debug("pps key = %s (%s)\n",key,line); debug("(parse_proc_status) pps key = %s (%s)\n",key,line);
#endif #endif
if (key == NULL) if (key == NULL)
return(FALSE); return(FALSE);
@ -267,7 +267,7 @@ void process_monitor()
FileMon *fmon; FileMon *fmon;
struct inotify_event *ivent; struct inotify_event *ivent;
char tmp[256]; char tmp[256];
int n; int n,m;
for(fmon=filemonlist;fmon;fmon=fmon->next) for(fmon=filemonlist;fmon;fmon=fmon->next)
{ {
@ -277,14 +277,14 @@ void process_monitor()
n = read(fmon->fd,globaldata,sizeof(struct inotify_event)); n = read(fmon->fd,globaldata,sizeof(struct inotify_event));
if (ivent->len > 0) if (ivent->len > 0)
read(fmon->fd,ivent->name,ivent->len); m = read(fmon->fd,ivent->name,ivent->len);
else else
*ivent->name = 0; *ivent->name = 0;
#ifdef DEBUG #ifdef DEBUG
debug("ino %i, n %i, sz %i\n",fmon->fd,n,sizeof(in2str)); debug("(process_monitor) ino %i, n %i, sz %i\n",fmon->fd,n,sizeof(in2str));
debug("wd %i, mask %lu, cookie %lu, len %lu, name %s\n", debug("(process_monitor) wd %i, mask %lu, cookie %lu, len %lu, name %s\n",
ivent->wd,ivent->mask,ivent->cookie,ivent->len,ivent->name); ivent->wd,ivent->mask,ivent->cookie,ivent->len,ivent->name);
debug("%s\n",inomask2str(ivent->mask,tmp)); debug("(process_monitor) %s\n",inomask2str(ivent->mask,tmp));
debug("(process_monitor) ino %i bytes read, int wd = %i, uint32_t mask = %s (%lu), " debug("(process_monitor) ino %i bytes read, int wd = %i, uint32_t mask = %s (%lu), "
"uint32_t cookie = %lu, uint32_t len = %lu, char name = %s\n", "uint32_t cookie = %lu, uint32_t len = %lu, char name = %s\n",
n,ivent->wd,inomask2str(ivent->mask,tmp),ivent->mask,ivent->cookie,ivent->len,ivent->name); n,ivent->wd,inomask2str(ivent->mask,tmp),ivent->mask,ivent->cookie,ivent->len,ivent->name);
@ -302,13 +302,13 @@ void process_monitor()
/*---------------------------------------------------------------------------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------------------------------------------------------------------------*/
/* /*
help:HOSTINFO:(no arguments) help:SYSINFO:(no arguments)
Equivalent to ``uname -orm'' Equivalent to ``uname -orm''
See also: meminfo, cpuinfo See also: meminfo, cpuinfo
*/ */
void do_hostinfo(COMMAND_ARGS) void do_sysinfo(COMMAND_ARGS)
{ {
char *h,hostname[256]; char *h,hostname[256];
struct utsname un; struct utsname un;
@ -363,7 +363,7 @@ See also: hostinfo, meminfo
*/ */
void do_cpuinfo(COMMAND_ARGS) void do_cpuinfo(COMMAND_ARGS)
{ {
char bogostr[64],cpustr[64]; char bogostr[256],cpustr[64];
char *a1,*a2,*a3,*dst; char *a1,*a2,*a3,*dst;
int fd,n; int fd,n;
double loads[3]; double loads[3];
@ -375,13 +375,6 @@ void do_cpuinfo(COMMAND_ARGS)
else else
stringcpy(bogostr,"/proc/cpuinfo"); stringcpy(bogostr,"/proc/cpuinfo");
if ((fd = open(bogostr,O_RDONLY)) < 0) if ((fd = open(bogostr,O_RDONLY)) < 0)
/*
if ((fd = open("/home/git/cpuinfo/mips3",O_RDONLY)) < 0)
if ((fd = open("/home/git/cpuinfo/mips2",O_RDONLY)) < 0)
if ((fd = open("/home/git/cpuinfo/mips1",O_RDONLY)) < 0)
if ((fd = open("/home/git/cpuinfo/intel1",O_RDONLY)) < 0)
if ((fd = open("/home/git/cpuinfo/cosmiccow",O_RDONLY)) < 0)
*/
#endif #endif
if ((fd = open("/proc/cpuinfo",O_RDONLY)) < 0) if ((fd = open("/proc/cpuinfo",O_RDONLY)) < 0)
#ifdef DEBUG #ifdef DEBUG