mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-12-26 20:31:17 +00:00
Added support for $pid_exe and $pid_stdin, $pid_stdout and $pid_stderr
This commit is contained in:
parent
6b20156a1b
commit
6c4f069f00
@ -1,5 +1,7 @@
|
|||||||
2009-11-12
|
2009-11-12
|
||||||
* Added support for $pid_environ_list
|
* Added support for $pid_environ_list
|
||||||
|
* Added support for $pid_exe
|
||||||
|
* Added support for $pid_stdin, $pid_stdout and $pid_stderr
|
||||||
|
|
||||||
2009-11-11
|
2009-11-11
|
||||||
* Added support for $pid_cmdline
|
* Added support for $pid_cmdline
|
||||||
|
@ -2529,6 +2529,46 @@
|
|||||||
<listitem>List of environment-vars that the process can see
|
<listitem>List of environment-vars that the process can see
|
||||||
<para /></listitem>
|
<para /></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
<varlistentry>
|
||||||
|
<term>
|
||||||
|
<command>
|
||||||
|
<option>pid_exe</option>
|
||||||
|
</command>
|
||||||
|
<option>pid</option>
|
||||||
|
</term>
|
||||||
|
<listitem>Path to executed command that started the process
|
||||||
|
<para /></listitem>
|
||||||
|
</varlistentry>
|
||||||
|
<varlistentry>
|
||||||
|
<term>
|
||||||
|
<command>
|
||||||
|
<option>pid_stdin</option>
|
||||||
|
</command>
|
||||||
|
<option>pid</option>
|
||||||
|
</term>
|
||||||
|
<listitem>Filedescriptor binded to the STDIN of the process
|
||||||
|
<para /></listitem>
|
||||||
|
</varlistentry>
|
||||||
|
<varlistentry>
|
||||||
|
<term>
|
||||||
|
<command>
|
||||||
|
<option>pid_stdout</option>
|
||||||
|
</command>
|
||||||
|
<option>pid</option>
|
||||||
|
</term>
|
||||||
|
<listitem>Filedescriptor binded to the STDOUT of the process
|
||||||
|
<para /></listitem>
|
||||||
|
</varlistentry>
|
||||||
|
<varlistentry>
|
||||||
|
<term>
|
||||||
|
<command>
|
||||||
|
<option>pid_stderr</option>
|
||||||
|
</command>
|
||||||
|
<option>pid</option>
|
||||||
|
</term>
|
||||||
|
<listitem>Filedescriptor binded to the STDERR of the process
|
||||||
|
<para /></listitem>
|
||||||
|
</varlistentry>
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term>
|
<term>
|
||||||
<command>
|
<command>
|
||||||
|
@ -11,7 +11,7 @@ color green "\<(alignment|append_file|background|border_inner_margin|border_oute
|
|||||||
color yellow "\<(above|below|bottom_left|bottom_right|bottom_middle|desktop|dock|no|none|normal|override|skip_pager|skip_taskbar|sticky|top_left|top_right|top_middle|middle_left|middle_right|undecorated|yes)\>"
|
color yellow "\<(above|below|bottom_left|bottom_right|bottom_middle|desktop|dock|no|none|normal|override|skip_pager|skip_taskbar|sticky|top_left|top_right|top_middle|middle_left|middle_right|undecorated|yes)\>"
|
||||||
|
|
||||||
## Variables
|
## Variables
|
||||||
color brightblue "\<(acpiacadapter|acpifan|acpitemp|addr|addrs|adt746xcpu|adt746xfan|alignc|alignr|apcupsd|apcupsd_cable|apcupsd_charge|apcupsd_lastxfer|apcupsd_linev|apcupsd_load|apcupsd_loadbar|apcupsd_loadgauge|apcupsd_loadgraph|apcupsd_model|apcupsd_name|apcupsd_status|apcupsd_temp|apcupsd_timeleft|apcupsd_upsmode|apm_adapter|apm_battery_life|apm_battery_time|audacious_bar|audacious_bitrate|audacious_channels|audacious_filename|audacious_frequency|audacious_length|audacious_length_seconds|audacious_main_volume|audacious_playlist_length|audacious_playlist_position|audacious_position|audacious_position_seconds|audacious_status|audacious_title|battery|battery_bar|battery_percent|battery_short|battery_time|blink|bmpx_album|bmpx_artist|bmpx_bitrate|bmpx_title|bmpx_track|bmpx_uri|buffers|cached|color|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|combine|conky_build_arch|conky_build_date|conky_version|cpu|cpubar|cpugauge|cpugraph|curl|desktop|desktop_name|desktop_number|disk_protect|diskio|diskio_read|diskio_write|diskiograph|diskiograph_read|diskiograph_write|downspeed|downspeedf|downspeedgraph|draft_mails|else|endif|entropy_avail|entropy_bar|entropy_perc|entropy_poolsize|eval|eve|exec|execbar|execgauge|execgraph|execi|execibar|execigauge|execigraph|execp|execpi|flagged_mails|font|forwarded_mails|freq|freq_g|fs_bar|fs_bar_free|fs_free|fs_free_perc|fs_size|fs_type|fs_used|fs_used_perc|goto|gw_iface|gw_ip|hddtemp|head|hr|hwmon|i2c|i8k_ac_status|i8k_bios|i8k_buttons_status|i8k_cpu_temp|i8k_left_fan_rpm|i8k_left_fan_status|i8k_right_fan_rpm|i8k_right_fan_status|i8k_serial|i8k_version|ibm_brightness|ibm_fan|ibm_temps|ibm_volume|iconv_start|iconv_stop|if_empty|if_existing|if_gw|if_match|if_mixer_mute|if_mounted|if_mpd_playing|if_running|if_smapi_bat_installed|if_up|if_updatenr|if_xmms2_connected|image|imap_messages|imap_unseen|include|ioscheduler|kernel|laptop_mode|lines|loadavg|loadgraph|lua|lua_bar|lua_gauge|lua_graph|lua_parse|machine|mails|mboxscan|mem|membar|memeasyfree|memfree|memgauge|memgraph|memmax|memperc|mixer|mixerbar|mixerl|mixerlbar|mixerr|mixerrbar|moc_album|moc_artist|moc_bitrate|moc_curtime|moc_file|moc_rate|moc_song|moc_state|moc_timeleft|moc_title|moc_totaltime|monitor|monitor_number|mpd_album|mpd_artist|mpd_bar|mpd_bitrate|mpd_elapsed|mpd_file|mpd_length|mpd_name|mpd_percent|mpd_random|mpd_repeat|mpd_smart|mpd_status|mpd_title|mpd_track|mpd_vol|nameserver|new_mails|nodename|nvidia|obsd_product|obsd_sensors_fan|obsd_sensors_temp|obsd_sensors_volt|obsd_vendor|offset|outlinecolor|pb_battery|pid_cmdline|pid_cwd|pid_environ|pid_environ_list|platform|pop3_unseen|pop3_used|pre_exec|processes|read_tcp|replied_mails|rss|running_processes|scroll|seen_mails|shadecolor|smapi|smapi_bat_bar|smapi_bat_perc|smapi_bat_power|smapi_bat_temp|sony_fanspeed|stippled_hr|swap|swapbar|swapfree|swapmax|swapperc|sysname|tab|tail|tcp_portmon|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|texeci|threads|time|to_bytes|top|top_io|top_mem|top_time|totaldown|totalup|trashed_mails|tztime|unflagged_mails|unforwarded_mails|unreplied_mails|unseen_mails|updates|upspeed|upspeedf|upspeedgraph|uptime|uptime_short|user_names|user_number|user_terms|user_times|utime|voffset|voltage_mv|voltage_v|weather|wireless_ap|wireless_bitrate|wireless_essid|wireless_link_bar|wireless_link_qual|wireless_link_qual_max|wireless_link_qual_perc|wireless_mode|words|xmms2_album|xmms2_artist|xmms2_bar|xmms2_bitrate|xmms2_comment|xmms2_date|xmms2_duration|xmms2_elapsed|xmms2_genre|xmms2_id|xmms2_percent|xmms2_playlist|xmms2_size|xmms2_smart|xmms2_status|xmms2_timesplayed|xmms2_title|xmms2_tracknr|xmms2_url)\>"
|
color brightblue "\<(acpiacadapter|acpifan|acpitemp|addr|addrs|adt746xcpu|adt746xfan|alignc|alignr|apcupsd|apcupsd_cable|apcupsd_charge|apcupsd_lastxfer|apcupsd_linev|apcupsd_load|apcupsd_loadbar|apcupsd_loadgauge|apcupsd_loadgraph|apcupsd_model|apcupsd_name|apcupsd_status|apcupsd_temp|apcupsd_timeleft|apcupsd_upsmode|apm_adapter|apm_battery_life|apm_battery_time|audacious_bar|audacious_bitrate|audacious_channels|audacious_filename|audacious_frequency|audacious_length|audacious_length_seconds|audacious_main_volume|audacious_playlist_length|audacious_playlist_position|audacious_position|audacious_position_seconds|audacious_status|audacious_title|battery|battery_bar|battery_percent|battery_short|battery_time|blink|bmpx_album|bmpx_artist|bmpx_bitrate|bmpx_title|bmpx_track|bmpx_uri|buffers|cached|color|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|combine|conky_build_arch|conky_build_date|conky_version|cpu|cpubar|cpugauge|cpugraph|curl|desktop|desktop_name|desktop_number|disk_protect|diskio|diskio_read|diskio_write|diskiograph|diskiograph_read|diskiograph_write|downspeed|downspeedf|downspeedgraph|draft_mails|else|endif|entropy_avail|entropy_bar|entropy_perc|entropy_poolsize|eval|eve|exec|execbar|execgauge|execgraph|execi|execibar|execigauge|execigraph|execp|execpi|flagged_mails|font|forwarded_mails|freq|freq_g|fs_bar|fs_bar_free|fs_free|fs_free_perc|fs_size|fs_type|fs_used|fs_used_perc|goto|gw_iface|gw_ip|hddtemp|head|hr|hwmon|i2c|i8k_ac_status|i8k_bios|i8k_buttons_status|i8k_cpu_temp|i8k_left_fan_rpm|i8k_left_fan_status|i8k_right_fan_rpm|i8k_right_fan_status|i8k_serial|i8k_version|ibm_brightness|ibm_fan|ibm_temps|ibm_volume|iconv_start|iconv_stop|if_empty|if_existing|if_gw|if_match|if_mixer_mute|if_mounted|if_mpd_playing|if_running|if_smapi_bat_installed|if_up|if_updatenr|if_xmms2_connected|image|imap_messages|imap_unseen|include|ioscheduler|kernel|laptop_mode|lines|loadavg|loadgraph|lua|lua_bar|lua_gauge|lua_graph|lua_parse|machine|mails|mboxscan|mem|membar|memeasyfree|memfree|memgauge|memgraph|memmax|memperc|mixer|mixerbar|mixerl|mixerlbar|mixerr|mixerrbar|moc_album|moc_artist|moc_bitrate|moc_curtime|moc_file|moc_rate|moc_song|moc_state|moc_timeleft|moc_title|moc_totaltime|monitor|monitor_number|mpd_album|mpd_artist|mpd_bar|mpd_bitrate|mpd_elapsed|mpd_file|mpd_length|mpd_name|mpd_percent|mpd_random|mpd_repeat|mpd_smart|mpd_status|mpd_title|mpd_track|mpd_vol|nameserver|new_mails|nodename|nvidia|obsd_product|obsd_sensors_fan|obsd_sensors_temp|obsd_sensors_volt|obsd_vendor|offset|outlinecolor|pb_battery|pid_cmdline|pid_cwd|pid_environ|pid_environ_list|pid_exe|pid_stderr|pid_stdin|pid_stdout|platform|pop3_unseen|pop3_used|pre_exec|processes|read_tcp|replied_mails|rss|running_processes|scroll|seen_mails|shadecolor|smapi|smapi_bat_bar|smapi_bat_perc|smapi_bat_power|smapi_bat_temp|sony_fanspeed|stippled_hr|swap|swapbar|swapfree|swapmax|swapperc|sysname|tab|tail|tcp_portmon|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|texeci|threads|time|to_bytes|top|top_io|top_mem|top_time|totaldown|totalup|trashed_mails|tztime|unflagged_mails|unforwarded_mails|unreplied_mails|unseen_mails|updates|upspeed|upspeedf|upspeedgraph|uptime|uptime_short|user_names|user_number|user_terms|user_times|utime|voffset|voltage_mv|voltage_v|weather|wireless_ap|wireless_bitrate|wireless_essid|wireless_link_bar|wireless_link_qual|wireless_link_qual_max|wireless_link_qual_perc|wireless_mode|words|xmms2_album|xmms2_artist|xmms2_bar|xmms2_bitrate|xmms2_comment|xmms2_date|xmms2_duration|xmms2_elapsed|xmms2_genre|xmms2_id|xmms2_percent|xmms2_playlist|xmms2_size|xmms2_smart|xmms2_status|xmms2_timesplayed|xmms2_title|xmms2_tracknr|xmms2_url)\>"
|
||||||
|
|
||||||
color brightblue "\$\{?[0-9A-Z_!@#$*?-]+\}?"
|
color brightblue "\$\{?[0-9A-Z_!@#$*?-]+\}?"
|
||||||
color cyan "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
|
color cyan "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
|
||||||
|
@ -49,7 +49,7 @@ syn region ConkyrcVar start=/\$\w\@=/ end=/\W\@=\|$/ contained contains=ConkyrcV
|
|||||||
|
|
||||||
syn match ConkyrcVarStuff /{\@<=/ms=s contained nextgroup=ConkyrcVarName
|
syn match ConkyrcVarStuff /{\@<=/ms=s contained nextgroup=ConkyrcVarName
|
||||||
|
|
||||||
syn keyword ConkyrcVarName contained nextgroup=ConkyrcNumber,ConkyrcColour skipwhite acpiacadapter acpifan acpitemp addr addrs adt746xcpu adt746xfan alignc alignr apcupsd apcupsd_cable apcupsd_charge apcupsd_lastxfer apcupsd_linev apcupsd_load apcupsd_loadbar apcupsd_loadgauge apcupsd_loadgraph apcupsd_model apcupsd_name apcupsd_status apcupsd_temp apcupsd_timeleft apcupsd_upsmode apm_adapter apm_battery_life apm_battery_time audacious_bar audacious_bitrate audacious_channels audacious_filename audacious_frequency audacious_length audacious_length_seconds audacious_main_volume audacious_playlist_length audacious_playlist_position audacious_position audacious_position_seconds audacious_status audacious_title battery battery_bar battery_percent battery_short battery_time blink bmpx_album bmpx_artist bmpx_bitrate bmpx_title bmpx_track bmpx_uri buffers cached color color0 color1 color2 color3 color4 color5 color6 color7 color8 color9 combine conky_build_arch conky_build_date conky_version cpu cpubar cpugauge cpugraph curl desktop desktop_name desktop_number disk_protect diskio diskio_read diskio_write diskiograph diskiograph_read diskiograph_write downspeed downspeedf downspeedgraph draft_mails else endif entropy_avail entropy_bar entropy_perc entropy_poolsize eval eve exec execbar execgauge execgraph execi execibar execigauge execigraph execp execpi flagged_mails font forwarded_mails freq freq_g fs_bar fs_bar_free fs_free fs_free_perc fs_size fs_type fs_used fs_used_perc goto gw_iface gw_ip hddtemp head hr hwmon i2c i8k_ac_status i8k_bios i8k_buttons_status i8k_cpu_temp i8k_left_fan_rpm i8k_left_fan_status i8k_right_fan_rpm i8k_right_fan_status i8k_serial i8k_version ibm_brightness ibm_fan ibm_temps ibm_volume iconv_start iconv_stop if_empty if_existing if_gw if_match if_mixer_mute if_mounted if_mpd_playing if_running if_smapi_bat_installed if_up if_updatenr if_xmms2_connected image imap_messages imap_unseen include ioscheduler kernel laptop_mode lines loadavg loadgraph lua lua_bar lua_gauge lua_graph lua_parse machine mails mboxscan mem membar memeasyfree memfree memgauge memgraph memmax memperc mixer mixerbar mixerl mixerlbar mixerr mixerrbar moc_album moc_artist moc_bitrate moc_curtime moc_file moc_rate moc_song moc_state moc_timeleft moc_title moc_totaltime monitor monitor_number mpd_album mpd_artist mpd_bar mpd_bitrate mpd_elapsed mpd_file mpd_length mpd_name mpd_percent mpd_random mpd_repeat mpd_smart mpd_status mpd_title mpd_track mpd_vol nameserver new_mails nodename nvidia obsd_product obsd_sensors_fan obsd_sensors_temp obsd_sensors_volt obsd_vendor offset outlinecolor pb_battery pid_cmdline pid_cwd pid_environ pid_environ_list platform pop3_unseen pop3_used pre_exec processes read_tcp replied_mails rss running_processes scroll seen_mails shadecolor smapi smapi_bat_bar smapi_bat_perc smapi_bat_power smapi_bat_temp sony_fanspeed stippled_hr swap swapbar swapfree swapmax swapperc sysname tab tail tcp_portmon template0 template1 template2 template3 template4 template5 template6 template7 template8 template9 texeci threads time to_bytes top top_io top_mem top_time totaldown totalup trashed_mails tztime unflagged_mails unforwarded_mails unreplied_mails unseen_mails updates upspeed upspeedf upspeedgraph uptime uptime_short user_names user_number user_terms user_times utime voffset voltage_mv voltage_v weather wireless_ap wireless_bitrate wireless_essid wireless_link_bar wireless_link_qual wireless_link_qual_max wireless_link_qual_perc wireless_mode words xmms2_album xmms2_artist xmms2_bar xmms2_bitrate xmms2_comment xmms2_date xmms2_duration xmms2_elapsed xmms2_genre xmms2_id xmms2_percent xmms2_playlist xmms2_size xmms2_smart xmms2_status xmms2_timesplayed xmms2_title xmms2_tracknr xmms2_url
|
syn keyword ConkyrcVarName contained nextgroup=ConkyrcNumber,ConkyrcColour skipwhite acpiacadapter acpifan acpitemp addr addrs adt746xcpu adt746xfan alignc alignr apcupsd apcupsd_cable apcupsd_charge apcupsd_lastxfer apcupsd_linev apcupsd_load apcupsd_loadbar apcupsd_loadgauge apcupsd_loadgraph apcupsd_model apcupsd_name apcupsd_status apcupsd_temp apcupsd_timeleft apcupsd_upsmode apm_adapter apm_battery_life apm_battery_time audacious_bar audacious_bitrate audacious_channels audacious_filename audacious_frequency audacious_length audacious_length_seconds audacious_main_volume audacious_playlist_length audacious_playlist_position audacious_position audacious_position_seconds audacious_status audacious_title battery battery_bar battery_percent battery_short battery_time blink bmpx_album bmpx_artist bmpx_bitrate bmpx_title bmpx_track bmpx_uri buffers cached color color0 color1 color2 color3 color4 color5 color6 color7 color8 color9 combine conky_build_arch conky_build_date conky_version cpu cpubar cpugauge cpugraph curl desktop desktop_name desktop_number disk_protect diskio diskio_read diskio_write diskiograph diskiograph_read diskiograph_write downspeed downspeedf downspeedgraph draft_mails else endif entropy_avail entropy_bar entropy_perc entropy_poolsize eval eve exec execbar execgauge execgraph execi execibar execigauge execigraph execp execpi flagged_mails font forwarded_mails freq freq_g fs_bar fs_bar_free fs_free fs_free_perc fs_size fs_type fs_used fs_used_perc goto gw_iface gw_ip hddtemp head hr hwmon i2c i8k_ac_status i8k_bios i8k_buttons_status i8k_cpu_temp i8k_left_fan_rpm i8k_left_fan_status i8k_right_fan_rpm i8k_right_fan_status i8k_serial i8k_version ibm_brightness ibm_fan ibm_temps ibm_volume iconv_start iconv_stop if_empty if_existing if_gw if_match if_mixer_mute if_mounted if_mpd_playing if_running if_smapi_bat_installed if_up if_updatenr if_xmms2_connected image imap_messages imap_unseen include ioscheduler kernel laptop_mode lines loadavg loadgraph lua lua_bar lua_gauge lua_graph lua_parse machine mails mboxscan mem membar memeasyfree memfree memgauge memgraph memmax memperc mixer mixerbar mixerl mixerlbar mixerr mixerrbar moc_album moc_artist moc_bitrate moc_curtime moc_file moc_rate moc_song moc_state moc_timeleft moc_title moc_totaltime monitor monitor_number mpd_album mpd_artist mpd_bar mpd_bitrate mpd_elapsed mpd_file mpd_length mpd_name mpd_percent mpd_random mpd_repeat mpd_smart mpd_status mpd_title mpd_track mpd_vol nameserver new_mails nodename nvidia obsd_product obsd_sensors_fan obsd_sensors_temp obsd_sensors_volt obsd_vendor offset outlinecolor pb_battery pid_cmdline pid_cwd pid_environ pid_environ_list pid_exe pid_stderr pid_stdin pid_stdout platform pop3_unseen pop3_used pre_exec processes read_tcp replied_mails rss running_processes scroll seen_mails shadecolor smapi smapi_bat_bar smapi_bat_perc smapi_bat_power smapi_bat_temp sony_fanspeed stippled_hr swap swapbar swapfree swapmax swapperc sysname tab tail tcp_portmon template0 template1 template2 template3 template4 template5 template6 template7 template8 template9 texeci threads time to_bytes top top_io top_mem top_time totaldown totalup trashed_mails tztime unflagged_mails unforwarded_mails unreplied_mails unseen_mails updates upspeed upspeedf upspeedgraph uptime uptime_short user_names user_number user_terms user_times utime voffset voltage_mv voltage_v weather wireless_ap wireless_bitrate wireless_essid wireless_link_bar wireless_link_qual wireless_link_qual_max wireless_link_qual_perc wireless_mode words xmms2_album xmms2_artist xmms2_bar xmms2_bitrate xmms2_comment xmms2_date xmms2_duration xmms2_elapsed xmms2_genre xmms2_id xmms2_percent xmms2_playlist xmms2_size xmms2_smart xmms2_status xmms2_timesplayed xmms2_title xmms2_tracknr xmms2_url
|
||||||
|
|
||||||
hi def link ConkyrcComment Comment
|
hi def link ConkyrcComment Comment
|
||||||
hi def link ConkyrcSetting Keyword
|
hi def link ConkyrcSetting Keyword
|
||||||
|
12
src/conky.c
12
src/conky.c
@ -1616,6 +1616,18 @@ void generate_text_internal(char *p, int p_max_size,
|
|||||||
OBJ(pid_environ_list) {
|
OBJ(pid_environ_list) {
|
||||||
print_pid_environ_list(obj, p, p_max_size);
|
print_pid_environ_list(obj, p, p_max_size);
|
||||||
}
|
}
|
||||||
|
OBJ(pid_exe) {
|
||||||
|
print_pid_exe(obj, p, p_max_size);
|
||||||
|
}
|
||||||
|
OBJ(pid_stderr) {
|
||||||
|
print_pid_stderr(obj, p, p_max_size);
|
||||||
|
}
|
||||||
|
OBJ(pid_stdin) {
|
||||||
|
print_pid_stdin(obj, p, p_max_size);
|
||||||
|
}
|
||||||
|
OBJ(pid_stdout) {
|
||||||
|
print_pid_stdout(obj, p, p_max_size);
|
||||||
|
}
|
||||||
OBJ(processes) {
|
OBJ(processes) {
|
||||||
spaced_print(p, p_max_size, "%hu", 4, cur->procs);
|
spaced_print(p, p_max_size, "%hu", 4, cur->procs);
|
||||||
}
|
}
|
||||||
|
22
src/core.c
22
src/core.c
@ -650,8 +650,16 @@ struct text_object *construct_text_object(const char *s, const char *arg, long
|
|||||||
scan_pid_cwd_arg(obj, arg, free_at_crash);
|
scan_pid_cwd_arg(obj, arg, free_at_crash);
|
||||||
END OBJ_ARG(pid_environ, 0, "pid_environ needs arguments")
|
END OBJ_ARG(pid_environ, 0, "pid_environ needs arguments")
|
||||||
scan_pid_environ_arg(obj, arg, free_at_crash);
|
scan_pid_environ_arg(obj, arg, free_at_crash);
|
||||||
END OBJ_ARG(pid_environ_list, 0, "pid_environ needs a pid as argument")
|
END OBJ_ARG(pid_environ_list, 0, "pid_environ_list needs a pid as argument")
|
||||||
scan_pid_environ_list_arg(obj, arg, free_at_crash);
|
scan_pid_environ_list_arg(obj, arg, free_at_crash);
|
||||||
|
END OBJ_ARG(pid_exe, 0, "pid_exe needs a pid as argument")
|
||||||
|
scan_pid_exe_arg(obj, arg, free_at_crash);
|
||||||
|
END OBJ_ARG(pid_stderr, 0, "pid_stderr needs a pid as argument")
|
||||||
|
scan_pid_stderr_arg(obj, arg, free_at_crash);
|
||||||
|
END OBJ_ARG(pid_stdin, 0, "pid_stdin needs a pid as argument")
|
||||||
|
scan_pid_stdin_arg(obj, arg, free_at_crash);
|
||||||
|
END OBJ_ARG(pid_stdout, 0, "pid_stdout needs a pid as argument")
|
||||||
|
scan_pid_stdout_arg(obj, arg, free_at_crash);
|
||||||
END OBJ(processes, &update_total_processes)
|
END OBJ(processes, &update_total_processes)
|
||||||
END OBJ(running_processes, &update_running_processes)
|
END OBJ(running_processes, &update_running_processes)
|
||||||
END OBJ(threads, &update_threads)
|
END OBJ(threads, &update_threads)
|
||||||
@ -1256,6 +1264,18 @@ void free_text_objects(struct text_object *root, int internal)
|
|||||||
case OBJ_pid_environ_list:
|
case OBJ_pid_environ_list:
|
||||||
free(data.s);
|
free(data.s);
|
||||||
break;
|
break;
|
||||||
|
case OBJ_pid_exe:
|
||||||
|
free(data.s);
|
||||||
|
break;
|
||||||
|
case OBJ_pid_stderr:
|
||||||
|
free(data.s);
|
||||||
|
break;
|
||||||
|
case OBJ_pid_stdin:
|
||||||
|
free(data.s);
|
||||||
|
break;
|
||||||
|
case OBJ_pid_stdout:
|
||||||
|
free(data.s);
|
||||||
|
break;
|
||||||
case OBJ_read_tcp:
|
case OBJ_read_tcp:
|
||||||
free_read_tcp(obj);
|
free_read_tcp(obj);
|
||||||
break;
|
break;
|
||||||
|
53
src/proc.c
53
src/proc.c
@ -152,13 +152,7 @@ void free_pid_environ(struct text_object *obj) {
|
|||||||
|
|
||||||
void scan_pid_environ_list_arg(struct text_object *obj, const char *arg, void* free_at_crash)
|
void scan_pid_environ_list_arg(struct text_object *obj, const char *arg, void* free_at_crash)
|
||||||
{
|
{
|
||||||
pid_t pid;
|
scan_pid_arg(obj, arg, free_at_crash, "environ");
|
||||||
|
|
||||||
if(sscanf(arg, "%d", &pid) == 1) {
|
|
||||||
asprintf(&obj->data.s, PROCDIR "/%d/environ", pid);
|
|
||||||
} else {
|
|
||||||
CRIT_ERR(obj, free_at_crash, "syntax error: ${pid_environ pid}");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void print_pid_environ_list(struct text_object *obj, char *p, int p_max_size)
|
void print_pid_environ_list(struct text_object *obj, char *p, int p_max_size)
|
||||||
@ -193,3 +187,48 @@ void print_pid_environ_list(struct text_object *obj, char *p, int p_max_size)
|
|||||||
NORM_ERR(READERR, obj->data.s);
|
NORM_ERR(READERR, obj->data.s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void scan_pid_exe_arg(struct text_object *obj, const char *arg, void* free_at_crash)
|
||||||
|
{
|
||||||
|
scan_pid_arg(obj, arg, free_at_crash, "exe");
|
||||||
|
}
|
||||||
|
|
||||||
|
void print_pid_readlink(struct text_object *obj, char *p, int p_max_size)
|
||||||
|
{
|
||||||
|
char buf[p_max_size];
|
||||||
|
|
||||||
|
memset(buf, 0, p_max_size);
|
||||||
|
if(readlink(obj->data.s, buf, p_max_size) >= 0) {
|
||||||
|
snprintf(p, p_max_size, buf);
|
||||||
|
} else {
|
||||||
|
NORM_ERR(READERR, obj->data.s);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void print_pid_exe(struct text_object *obj, char *p, int p_max_size) {
|
||||||
|
print_pid_readlink(obj, p, p_max_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
void scan_pid_stderr_arg(struct text_object *obj, const char *arg, void* free_at_crash) {
|
||||||
|
scan_pid_arg(obj, arg, free_at_crash, "fd/2");
|
||||||
|
}
|
||||||
|
|
||||||
|
void print_pid_stderr(struct text_object *obj, char *p, int p_max_size) {
|
||||||
|
print_pid_readlink(obj, p, p_max_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
void scan_pid_stdin_arg(struct text_object *obj, const char *arg, void* free_at_crash) {
|
||||||
|
scan_pid_arg(obj, arg, free_at_crash, "fd/0");
|
||||||
|
}
|
||||||
|
|
||||||
|
void print_pid_stdin(struct text_object *obj, char *p, int p_max_size) {
|
||||||
|
print_pid_readlink(obj, p, p_max_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
void scan_pid_stdout_arg(struct text_object *obj, const char *arg, void* free_at_crash) {
|
||||||
|
scan_pid_arg(obj, arg, free_at_crash, "fd/1");
|
||||||
|
}
|
||||||
|
|
||||||
|
void print_pid_stdout(struct text_object *obj, char *p, int p_max_size) {
|
||||||
|
print_pid_readlink(obj, p, p_max_size);
|
||||||
|
}
|
||||||
|
12
src/proc.h
12
src/proc.h
@ -49,3 +49,15 @@ void free_pid_environ(struct text_object *obj);
|
|||||||
|
|
||||||
void scan_pid_environ_list_arg(struct text_object *obj, const char *arg, void* free_at_crash);
|
void scan_pid_environ_list_arg(struct text_object *obj, const char *arg, void* free_at_crash);
|
||||||
void print_pid_environ_list(struct text_object *obj, char *p, int p_max_size);
|
void print_pid_environ_list(struct text_object *obj, char *p, int p_max_size);
|
||||||
|
|
||||||
|
void scan_pid_exe_arg(struct text_object *obj, const char *arg, void* free_at_crash);
|
||||||
|
void print_pid_exe(struct text_object *obj, char *p, int p_max_size);
|
||||||
|
|
||||||
|
void scan_pid_stderr_arg(struct text_object *obj, const char *arg, void* free_at_crash);
|
||||||
|
void print_pid_stderr(struct text_object *obj, char *p, int p_max_size);
|
||||||
|
|
||||||
|
void scan_pid_stdin_arg(struct text_object *obj, const char *arg, void* free_at_crash);
|
||||||
|
void print_pid_stdin(struct text_object *obj, char *p, int p_max_size);
|
||||||
|
|
||||||
|
void scan_pid_stdout_arg(struct text_object *obj, const char *arg, void* free_at_crash);
|
||||||
|
void print_pid_stdout(struct text_object *obj, char *p, int p_max_size);
|
||||||
|
@ -239,6 +239,10 @@ enum text_object_type {
|
|||||||
OBJ_pid_cwd,
|
OBJ_pid_cwd,
|
||||||
OBJ_pid_environ,
|
OBJ_pid_environ,
|
||||||
OBJ_pid_environ_list,
|
OBJ_pid_environ_list,
|
||||||
|
OBJ_pid_exe,
|
||||||
|
OBJ_pid_stderr,
|
||||||
|
OBJ_pid_stdin,
|
||||||
|
OBJ_pid_stdout,
|
||||||
OBJ_processes,
|
OBJ_processes,
|
||||||
OBJ_running_processes,
|
OBJ_running_processes,
|
||||||
OBJ_shadecolor,
|
OBJ_shadecolor,
|
||||||
|
Loading…
Reference in New Issue
Block a user