diff --git a/ChangeLog b/ChangeLog index 5a4f513d..e33c7c3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2009-11-15 - * Added support for $pid_parent + * Added support for $pid_parent, $pid_uid, $pid_euid, $pid_suid, + $pid_fsuid, $pid_gid, $pid_egid, $pid_sgid and $pid_fsgid 2009-11-14 * Added support for $pid_state and $pid_state_short diff --git a/doc/variables.xml b/doc/variables.xml index d81525df..23337705 100644 --- a/doc/variables.xml +++ b/doc/variables.xml @@ -2634,6 +2634,86 @@ Filedescriptor binded to the STDOUT of the process + + + + + + + + The real uid of the process + + + + + + + + + + The effective uid of the process + + + + + + + + + + The saved set uid of the process + + + + + + + + + + The file system uid of the process + + + + + + + + + + The real gid of the process + + + + + + + + + + The effective gid of the process + + + + + + + + + + The saved set gid of the process + + + + + + + + + + The file system gid of the process + + diff --git a/extras/nano/conky.nanorc b/extras/nano/conky.nanorc index 0eb745b0..541e7b59 100644 --- a/extras/nano/conky.nanorc +++ b/extras/nano/conky.nanorc @@ -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|middle_middle|undecorated|yes)\>" ## Variables -color brightblue "\<(acpiacadapter|acpifan|acpitemp|addr|addrs|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|cmdline_to_pid|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_chroot|pid_cmdline|pid_cwd|pid_environ|pid_environ_list|pid_exe|pid_openfiles|pid_parent|pid_state|pid_state_short|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|user_time|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|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|cmdline_to_pid|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_chroot|pid_cmdline|pid_cwd|pid_environ|pid_environ_list|pid_exe|pid_openfiles|pid_parent|pid_state|pid_state_short|pid_stderr|pid_stdin|pid_stdout|pid_uid|pid_euid|pid_suid|pid_fsuid|pid_gid|pid_egid|pid_sgid|pid_fsgid|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|user_time|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 cyan "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)" diff --git a/extras/vim/syntax/conkyrc.vim b/extras/vim/syntax/conkyrc.vim index a76a8dc4..4fd8a500 100644 --- a/extras/vim/syntax/conkyrc.vim +++ b/extras/vim/syntax/conkyrc.vim @@ -50,7 +50,7 @@ syn region ConkyrcVar start=/\$\w\@=/ end=/\W\@=\|$/ contained contains=ConkyrcV syn match ConkyrcVarStuff /{\@<=/ms=s contained nextgroup=ConkyrcVarName -syn keyword ConkyrcVarName contained nextgroup=ConkyrcNumber,ConkyrcColour skipwhite acpiacadapter acpifan acpitemp addr addrs 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 cmdline_to_pid 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_chroot pid_cmdline pid_cwd pid_environ pid_environ_list pid_exe pid_openfiles pid_parent pid_state pid_state_short 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 user_time 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 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 cmdline_to_pid 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_chroot pid_cmdline pid_cwd pid_environ pid_environ_list pid_exe pid_openfiles pid_parent pid_state pid_state_short pid_stderr pid_stdin pid_stdout pid_uid pid_euid pid_suid pid_fsuid pid_gid pid_egid pid_sgid pid_fsgid 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 user_time 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 ConkyrcSetting Keyword diff --git a/src/conky.c b/src/conky.c index 13ea9d51..a9973d8a 100644 --- a/src/conky.c +++ b/src/conky.c @@ -1694,6 +1694,62 @@ void generate_text_internal(char *p, int p_max_size, obj->data.s = buf; print_pid_stdout(obj, p, p_max_size); } + OBJ(pid_uid) { + char buf[max_user_text]; + + generate_text_internal(buf, max_user_text, *obj->sub, cur); + obj->data.s = buf; + print_pid_uid(obj, p, p_max_size); + } + OBJ(pid_euid) { + char buf[max_user_text]; + + generate_text_internal(buf, max_user_text, *obj->sub, cur); + obj->data.s = buf; + print_pid_euid(obj, p, p_max_size); + } + OBJ(pid_suid) { + char buf[max_user_text]; + + generate_text_internal(buf, max_user_text, *obj->sub, cur); + obj->data.s = buf; + print_pid_suid(obj, p, p_max_size); + } + OBJ(pid_fsuid) { + char buf[max_user_text]; + + generate_text_internal(buf, max_user_text, *obj->sub, cur); + obj->data.s = buf; + print_pid_fsuid(obj, p, p_max_size); + } + OBJ(pid_gid) { + char buf[max_user_text]; + + generate_text_internal(buf, max_user_text, *obj->sub, cur); + obj->data.s = buf; + print_pid_gid(obj, p, p_max_size); + } + OBJ(pid_egid) { + char buf[max_user_text]; + + generate_text_internal(buf, max_user_text, *obj->sub, cur); + obj->data.s = buf; + print_pid_egid(obj, p, p_max_size); + } + OBJ(pid_sgid) { + char buf[max_user_text]; + + generate_text_internal(buf, max_user_text, *obj->sub, cur); + obj->data.s = buf; + print_pid_sgid(obj, p, p_max_size); + } + OBJ(pid_fsgid) { + char buf[max_user_text]; + + generate_text_internal(buf, max_user_text, *obj->sub, cur); + obj->data.s = buf; + print_pid_fsgid(obj, p, p_max_size); + } OBJ(processes) { spaced_print(p, p_max_size, "%hu", 4, cur->procs); } diff --git a/src/core.c b/src/core.c index beb09c60..f33afe80 100644 --- a/src/core.c +++ b/src/core.c @@ -680,6 +680,30 @@ struct text_object *construct_text_object(const char *s, const char *arg, long END OBJ_ARG(pid_stdout, 0, "pid_stdout needs a pid as argument") obj->sub = malloc(sizeof(struct text_object)); extract_variable_text_internal(obj->sub, arg); + END OBJ_ARG(pid_uid, 0, "pid_uid needs a pid as argument") + obj->sub = malloc(sizeof(struct text_object)); + extract_variable_text_internal(obj->sub, arg); + END OBJ_ARG(pid_euid, 0, "pid_euid needs a pid as argument") + obj->sub = malloc(sizeof(struct text_object)); + extract_variable_text_internal(obj->sub, arg); + END OBJ_ARG(pid_suid, 0, "pid_suid needs a pid as argument") + obj->sub = malloc(sizeof(struct text_object)); + extract_variable_text_internal(obj->sub, arg); + END OBJ_ARG(pid_fsuid, 0, "pid_fsuid needs a pid as argument") + obj->sub = malloc(sizeof(struct text_object)); + extract_variable_text_internal(obj->sub, arg); + END OBJ_ARG(pid_gid, 0, "pid_gid needs a pid as argument") + obj->sub = malloc(sizeof(struct text_object)); + extract_variable_text_internal(obj->sub, arg); + END OBJ_ARG(pid_egid, 0, "pid_egid needs a pid as argument") + obj->sub = malloc(sizeof(struct text_object)); + extract_variable_text_internal(obj->sub, arg); + END OBJ_ARG(pid_sgid, 0, "pid_sgid needs a pid as argument") + obj->sub = malloc(sizeof(struct text_object)); + extract_variable_text_internal(obj->sub, arg); + END OBJ_ARG(pid_fsgid, 0, "pid_fsgid needs a pid as argument") + obj->sub = malloc(sizeof(struct text_object)); + extract_variable_text_internal(obj->sub, arg); END OBJ(processes, &update_total_processes) END OBJ(running_processes, &update_running_processes) #ifdef __linux__ @@ -1288,6 +1312,14 @@ void free_text_objects(struct text_object *root, int internal) case OBJ_pid_stderr: case OBJ_pid_stdin: case OBJ_pid_stdout: + case OBJ_pid_uid: + case OBJ_pid_euid: + case OBJ_pid_suid: + case OBJ_pid_fsuid: + case OBJ_pid_gid: + case OBJ_pid_egid: + case OBJ_pid_sgid: + case OBJ_pid_fsgid: if(obj->sub) { free_text_objects(obj->sub, 1); free(obj->sub); diff --git a/src/proc.c b/src/proc.c index 2d19626a..683bc23a 100644 --- a/src/proc.c +++ b/src/proc.c @@ -384,3 +384,217 @@ void print_cmdline_to_pid(struct text_object *obj, char *p, int p_max_size) { NORM_ERR(READERR, PROCDIR); } } + +#define UID_ENTRY "Uid:\t" +void print_pid_uid(struct text_object *obj, char *p, int p_max_size) { +#define UIDNOTFOUND "Can't find the process real uid in '%s'" + char *begin, *end, *buf = NULL; + int bytes_read; + + asprintf(&buf, PROCDIR "/%s/status", obj->data.s); + strcpy(obj->data.s, buf); + free(buf); + buf = readfile(obj->data.s, &bytes_read, 1); + if(buf != NULL) { + begin = strstr(buf, UID_ENTRY); + if(begin != NULL) { + begin += strlen(UID_ENTRY); + end = strchr(begin, '\t'); + if(end != NULL) { + *(end) = 0; + } + snprintf(p, p_max_size, "%s", begin); + } else { + NORM_ERR(UIDNOTFOUND, obj->data.s); + } + free(buf); + } +} + +void print_pid_euid(struct text_object *obj, char *p, int p_max_size) { +#define EUIDNOTFOUND "Can't find the process effective uid in '%s'" + char *begin, *end, *buf = NULL; + int bytes_read; + + asprintf(&buf, PROCDIR "/%s/status", obj->data.s); + strcpy(obj->data.s, buf); + free(buf); + buf = readfile(obj->data.s, &bytes_read, 1); + if(buf != NULL) { + begin = strstr(buf, UID_ENTRY); + if(begin != NULL) { + begin = strchr(begin, '\t'); begin++; + begin = strchr(begin, '\t'); begin++; + end = strchr(begin, '\t'); + if(end != NULL) { + *(end) = 0; + } + snprintf(p, p_max_size, "%s", begin); + } else { + NORM_ERR(EUIDNOTFOUND, obj->data.s); + } + free(buf); + } +} + +void print_pid_suid(struct text_object *obj, char *p, int p_max_size) { +#define SUIDNOTFOUND "Can't find the process saved set uid in '%s'" + char *begin, *end, *buf = NULL; + int bytes_read; + + asprintf(&buf, PROCDIR "/%s/status", obj->data.s); + strcpy(obj->data.s, buf); + free(buf); + buf = readfile(obj->data.s, &bytes_read, 1); + if(buf != NULL) { + begin = strstr(buf, UID_ENTRY); + if(begin != NULL) { + begin = strchr(begin, '\t'); begin++; + begin = strchr(begin, '\t'); begin++; + begin = strchr(begin, '\t'); begin++; + end = strchr(begin, '\t'); + if(end != NULL) { + *(end) = 0; + } + snprintf(p, p_max_size, "%s", begin); + } else { + NORM_ERR(SUIDNOTFOUND, obj->data.s); + } + free(buf); + } +} + +void print_pid_fsuid(struct text_object *obj, char *p, int p_max_size) { +#define FSUIDNOTFOUND "Can't find the process file system uid in '%s'" + char *begin, *end, *buf = NULL; + int bytes_read; + + asprintf(&buf, PROCDIR "/%s/status", obj->data.s); + strcpy(obj->data.s, buf); + free(buf); + buf = readfile(obj->data.s, &bytes_read, 1); + if(buf != NULL) { + begin = strstr(buf, UID_ENTRY); + if(begin != NULL) { + begin = strchr(begin, '\t'); begin++; + begin = strchr(begin, '\t'); begin++; + begin = strchr(begin, '\t'); begin++; + begin = strchr(begin, '\t'); begin++; + end = strchr(begin, '\n'); + if(end != NULL) { + *(end) = 0; + } + snprintf(p, p_max_size, "%s", begin); + } else { + NORM_ERR(FSUIDNOTFOUND, obj->data.s); + } + free(buf); + } +} + +#define GID_ENTRY "Gid:\t" +void print_pid_gid(struct text_object *obj, char *p, int p_max_size) { +#define GIDNOTFOUND "Can't find the process real gid in '%s'" + char *begin, *end, *buf = NULL; + int bytes_read; + + asprintf(&buf, PROCDIR "/%s/status", obj->data.s); + strcpy(obj->data.s, buf); + free(buf); + buf = readfile(obj->data.s, &bytes_read, 1); + if(buf != NULL) { + begin = strstr(buf, GID_ENTRY); + if(begin != NULL) { + begin += strlen(GID_ENTRY); + end = strchr(begin, '\t'); + if(end != NULL) { + *(end) = 0; + } + snprintf(p, p_max_size, "%s", begin); + } else { + NORM_ERR(GIDNOTFOUND, obj->data.s); + } + free(buf); + } +} + +void print_pid_egid(struct text_object *obj, char *p, int p_max_size) { +#define EGIDNOTFOUND "Can't find the process effective gid in '%s'" + char *begin, *end, *buf = NULL; + int bytes_read; + + asprintf(&buf, PROCDIR "/%s/status", obj->data.s); + strcpy(obj->data.s, buf); + free(buf); + buf = readfile(obj->data.s, &bytes_read, 1); + if(buf != NULL) { + begin = strstr(buf, GID_ENTRY); + if(begin != NULL) { + begin = strchr(begin, '\t'); begin++; + begin = strchr(begin, '\t'); begin++; + end = strchr(begin, '\t'); + if(end != NULL) { + *(end) = 0; + } + snprintf(p, p_max_size, "%s", begin); + } else { + NORM_ERR(EGIDNOTFOUND, obj->data.s); + } + free(buf); + } +} + +void print_pid_sgid(struct text_object *obj, char *p, int p_max_size) { +#define SGIDNOTFOUND "Can't find the process saved set gid in '%s'" + char *begin, *end, *buf = NULL; + int bytes_read; + + asprintf(&buf, PROCDIR "/%s/status", obj->data.s); + strcpy(obj->data.s, buf); + free(buf); + buf = readfile(obj->data.s, &bytes_read, 1); + if(buf != NULL) { + begin = strstr(buf, GID_ENTRY); + if(begin != NULL) { + begin = strchr(begin, '\t'); begin++; + begin = strchr(begin, '\t'); begin++; + begin = strchr(begin, '\t'); begin++; + end = strchr(begin, '\t'); + if(end != NULL) { + *(end) = 0; + } + snprintf(p, p_max_size, "%s", begin); + } else { + NORM_ERR(SGIDNOTFOUND, obj->data.s); + } + free(buf); + } +} + +void print_pid_fsgid(struct text_object *obj, char *p, int p_max_size) { +#define FSGIDNOTFOUND "Can't find the process file system gid in '%s'" + char *begin, *end, *buf = NULL; + int bytes_read; + + asprintf(&buf, PROCDIR "/%s/status", obj->data.s); + strcpy(obj->data.s, buf); + free(buf); + buf = readfile(obj->data.s, &bytes_read, 1); + if(buf != NULL) { + begin = strstr(buf, GID_ENTRY); + if(begin != NULL) { + begin = strchr(begin, '\t'); begin++; + begin = strchr(begin, '\t'); begin++; + begin = strchr(begin, '\t'); begin++; + begin = strchr(begin, '\t'); begin++; + end = strchr(begin, '\n'); + if(end != NULL) { + *(end) = 0; + } + snprintf(p, p_max_size, "%s", begin); + } else { + NORM_ERR(FSGIDNOTFOUND, obj->data.s); + } + free(buf); + } +} diff --git a/src/proc.h b/src/proc.h index dc35fc62..d00abf4f 100644 --- a/src/proc.h +++ b/src/proc.h @@ -45,6 +45,14 @@ void print_pid_state_short(struct text_object *obj, char *p, int p_max_size); void print_pid_stderr(struct text_object *obj, char *p, int p_max_size); void print_pid_stdin(struct text_object *obj, char *p, int p_max_size); void print_pid_stdout(struct text_object *obj, char *p, int p_max_size); +void print_pid_uid(struct text_object *obj, char *p, int p_max_size); +void print_pid_euid(struct text_object *obj, char *p, int p_max_size); +void print_pid_suid(struct text_object *obj, char *p, int p_max_size); +void print_pid_fsuid(struct text_object *obj, char *p, int p_max_size); +void print_pid_gid(struct text_object *obj, char *p, int p_max_size); +void print_pid_egid(struct text_object *obj, char *p, int p_max_size); +void print_pid_sgid(struct text_object *obj, char *p, int p_max_size); +void print_pid_fsgid(struct text_object *obj, char *p, int p_max_size); void scan_cmdline_to_pid_arg(struct text_object *obj, const char *arg, void* free_at_crash); void print_cmdline_to_pid(struct text_object *obj, char *p, int p_max_size); diff --git a/src/text_object.h b/src/text_object.h index 2f90481f..d8014203 100644 --- a/src/text_object.h +++ b/src/text_object.h @@ -247,6 +247,14 @@ enum text_object_type { OBJ_pid_stderr, OBJ_pid_stdin, OBJ_pid_stdout, + OBJ_pid_uid, + OBJ_pid_euid, + OBJ_pid_suid, + OBJ_pid_fsuid, + OBJ_pid_gid, + OBJ_pid_egid, + OBJ_pid_sgid, + OBJ_pid_fsgid, OBJ_processes, OBJ_running_processes, OBJ_shadecolor,